rev 153 - in trunk: . modules modules/Dict modules/File modules/Float modules/List modules/Re modules/String modules/Tuple src
SVN User <[email protected]>
| Newsgroups | gmane.comp.lang.prothon.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bcollins
Date: 2004-03-27 11:46:33 -0500 (Sat, 27 Mar 2004)
New Revision: 153
Added:
trunk/modules/Dict/Makefile.in
trunk/modules/File/Makefile.in
trunk/modules/Float/Makefile.in
trunk/modules/List/Makefile.in
trunk/modules/Re/Makefile.in
trunk/modules/String/Makefile.in
trunk/modules/Tuple/Makefile.in
Modified:
trunk/Rules.mk.in
trunk/configure
trunk/configure.in
trunk/modules/Makefile.in
trunk/src/Makefile.in
Log:
We are full-on libtoolized now. Let's see how this builds on MacOSX.
Modified: trunk/Rules.mk.in
===================================================================
--- trunk/Rules.mk.in 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/Rules.mk.in 2004-03-27 16:46:33 UTC (rev 153)
@@ -8,6 +8,8 @@
libdir = @libdir@
sysconfdir = @sysconfdir@
mandir = @mandir@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
PROTHON_DEFAULT_MODDIR = @PROTHON_DEFAULT_MODDIR@
@@ -15,8 +17,10 @@
LD=$(CC)
YACC=@YACC@
+VPATH = $(srcdir)
+
CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@ -I$(top_srcdir)/include -I. \
+CPPFLAGS=@CPPFLAGS@ -I$(abs_srcdir)/include -I. \
-DPROTHON_DEFAULT_MODDIR="\"$(PROTHON_DEFAULT_MODDIR)\""
LDFLAGS=@LDFLAGS@
@@ -29,13 +33,20 @@
LIBTOOL = @LIBTOOL@
LTFLAGS = --silent
-LT_LDFLAGS = @LT_LDFLAGS@
+LINK_LIBTOOL = @LINK_LIBTOOL@
+LINK_LD = @LINK_LD@
COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
+ -export-dynamic $(LINK_LIBTOOL) $(LIBS)
+LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -module -avoid-version \
+ -export-dynamic dll_export -module -rpath $(libdir) $(CFLAGS) \
+ $(LDFLAGS) $(LINK_LIBTOOL) $(LIBS)
+LIB_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+
.SUFFIXES:
.SUFFIXES: .c .lo .o .la-a .la
@@ -44,6 +55,3 @@
.c.lo:
$(LT_COMPILE) -o $@ -c $<
-
-.la.la-a:
- sed "/library_names/s/'.*'/''/" $< > $@
Modified: trunk/configure
===================================================================
--- trunk/configure 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/configure 2004-03-27 16:46:33 UTC (rev 153)
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC VERSION PROTHON_DEFAULT_MODDIR HAVE_BOOST_REGEX BOOST_REGEX_LIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC VERSION PROTHON_DEFAULT_MODDIR HAVE_BOOST_REGEX BOOST_REGEX_LIBS LINK_LD LINK_LIBTOOL LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -19215,14 +19215,24 @@
{ (exit 1); exit 1; }; }
fi
-LIBS="$LIBS `$apr_config --link-ld --libs`"
+LINK_LD="`$apr_config --link-ld --libs`"
if test $? -ne 0; then
{ { echo "$as_me:$LINENO: error: apr-config --link-ld --libs failed" >&5
echo "$as_me: error: apr-config --link-ld --libs failed" >&2;}
{ (exit 1); exit 1; }; }
fi
- ac_config_files="$ac_config_files Rules.mk Makefile src/Makefile modules/Makefile"
+LINK_LIBTOOL="`apr-config --link-libtool --libs`"
+if test $? -ne 0; then
+ { { echo "$as_me:$LINENO: error: apr-config --link-libtool --libs failed" >&5
+echo "$as_me: error: apr-config --link-libtool --libs failed" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+
+ ac_config_files="$ac_config_files Rules.mk Makefile src/Makefile modules/Makefile modules/File/Makefile modules/Dict/Makefile modules/Re/Makefile modules/Float/Makefile modules/String/Makefile modules/Tuple/Makefile modules/List/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -19752,6 +19762,13 @@
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
+ "modules/File/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/File/Makefile" ;;
+ "modules/Dict/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Dict/Makefile" ;;
+ "modules/Re/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Re/Makefile" ;;
+ "modules/Float/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Float/Makefile" ;;
+ "modules/String/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/String/Makefile" ;;
+ "modules/Tuple/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Tuple/Makefile" ;;
+ "modules/List/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/List/Makefile" ;;
"include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -19878,6 +19895,8 @@
s,@PROTHON_DEFAULT_MODDIR@,$PROTHON_DEFAULT_MODDIR,;t t
s,@HAVE_BOOST_REGEX@,$HAVE_BOOST_REGEX,;t t
s,@BOOST_REGEX_LIBS@,$BOOST_REGEX_LIBS,;t t
+s,@LINK_LD@,$LINK_LD,;t t
+s,@LINK_LIBTOOL@,$LINK_LIBTOOL,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/configure.in 2004-03-27 16:46:33 UTC (rev 153)
@@ -60,9 +60,21 @@
AC_MSG_ERROR([apr-config --ldflags failed])
fi
-LIBS="$LIBS `$apr_config --link-ld --libs`"
+LINK_LD="`$apr_config --link-ld --libs`"
if test $? -ne 0; then
AC_MSG_ERROR([apr-config --link-ld --libs failed])
fi
-AC_OUTPUT(Rules.mk Makefile src/Makefile modules/Makefile)
+LINK_LIBTOOL="`apr-config --link-libtool --libs`"
+if test $? -ne 0; then
+ AC_MSG_ERROR([apr-config --link-libtool --libs failed])
+fi
+
+AC_SUBST(LINK_LD)
+AC_SUBST(LINK_LIBTOOL)
+
+AC_OUTPUT(Rules.mk Makefile src/Makefile modules/Makefile
+ modules/File/Makefile modules/Dict/Makefile
+ modules/Re/Makefile modules/Float/Makefile
+ modules/String/Makefile modules/Tuple/Makefile
+ modules/List/Makefile)
Added: trunk/modules/Dict/Makefile.in
===================================================================
--- trunk/modules/Dict/Makefile.in 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/modules/Dict/Makefile.in 2004-03-27 16:46:33 UTC (rev 153)
@@ -0,0 +1,28 @@
+# prothon
+#
+# Copyright (C) 2004 Mark Hahn <[email protected]>
+
+srcdir=@srcdir@
+top_builddir=@top_builddir@
+
+include $(top_builddir)/Rules.mk
+
+MODULE_NAME=Dict
+
+TARGET = $(MODULE_NAME).la
+
+OBJS = $(MODULE_NAME).lo
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@
+
+install: $(TARGET)
+ $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/
+
+distclean: clean
+ rm -f Makefile
+
+clean:
+ rm -fr *.o *.lo *.la .libs
Added: trunk/modules/File/Makefile.in
===================================================================
--- trunk/modules/File/Makefile.in 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/modules/File/Makefile.in 2004-03-27 16:46:33 UTC (rev 153)
@@ -0,0 +1,28 @@
+# prothon
+#
+# Copyright (C) 2004 Mark Hahn <[email protected]>
+
+srcdir=@srcdir@
+top_builddir=@top_builddir@
+
+include $(top_builddir)/Rules.mk
+
+MODULE_NAME=File
+
+TARGET = $(MODULE_NAME).la
+
+OBJS = $(MODULE_NAME).lo
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@
+
+install: $(TARGET)
+ $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/
+
+distclean: clean
+ rm -f Makefile
+
+clean:
+ rm -fr *.o *.lo *.la .libs
Added: trunk/modules/Float/Makefile.in
===================================================================
--- trunk/modules/Float/Makefile.in 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/modules/Float/Makefile.in 2004-03-27 16:46:33 UTC (rev 153)
@@ -0,0 +1,28 @@
+# prothon
+#
+# Copyright (C) 2004 Mark Hahn <[email protected]>
+
+srcdir=@srcdir@
+top_builddir=@top_builddir@
+
+include $(top_builddir)/Rules.mk
+
+MODULE_NAME=Float
+
+TARGET = $(MODULE_NAME).la
+
+OBJS = $(MODULE_NAME).lo
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@
+
+install: $(TARGET)
+ $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/
+
+distclean: clean
+ rm -f Makefile
+
+clean:
+ rm -fr *.o *.lo *.la .libs
Added: trunk/modules/List/Makefile.in
===================================================================
--- trunk/modules/List/Makefile.in 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/modules/List/Makefile.in 2004-03-27 16:46:33 UTC (rev 153)
@@ -0,0 +1,28 @@
+# prothon
+#
+# Copyright (C) 2004 Mark Hahn <[email protected]>
+
+srcdir=@srcdir@
+top_builddir=@top_builddir@
+
+include $(top_builddir)/Rules.mk
+
+MODULE_NAME=List
+
+TARGET = $(MODULE_NAME).la
+
+OBJS = $(MODULE_NAME).lo
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@
+
+install: $(TARGET)
+ $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/
+
+distclean: clean
+ rm -f Makefile
+
+clean:
+ rm -fr *.o *.lo *.la .libs
Modified: trunk/modules/Makefile.in
===================================================================
--- trunk/modules/Makefile.in 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/modules/Makefile.in 2004-03-27 16:46:33 UTC (rev 153)
@@ -2,36 +2,26 @@
#
# Copyright (C) 2004 Mark Hahn <[email protected]>
-top_srcdir=@top_srcdir@
+top_builddir=@top_builddir@
+srcdir=@srcdir@
-VPATH = @top_srcdir@/modules
+include $(top_builddir)/Rules.mk
-include ../Rules.mk
+MODULES = Dict File Float List String Tuple Re
-HAVE_BOOST_REGEX = @HAVE_BOOST_REGEX@
-BOOST_REGEX_LIBS = @BOOST_REGEX_LIBS@
+all clean:
+ @for subdir in $(MODULES); do \
+ $(MAKE) -C $$subdir $@; \
+ done
-MODULE_TARGETS = Dict/Dict.so File/File.so Float/Float.so List/List.so \
- String/String.so Tuple/Tuple.so
-
-ifneq ($(HAVE_BOOST_REGEX),)
-MODULE_TARGETS += Re/Re.so
-endif
-
-all: $(MODULE_TARGETS)
-
-Re/Re.so: Re/Re.o
- $(LD) $(LDFLAGS) $(LIBS) $(BOOST_REGEX_LIBS) -shared $< -o $@
-
-%.so: %.o
- $(LD) $(LDFLAGS) $(LIBS) -shared $< -o $@
-
-install: $(TARGET)
+install:
$(INSTALL_DIR) $(PROTHON_DEFAULT_MODDIR)
- $(INSTALL_PROGRAM) $(MODULE_TARGETS) $(PROTHON_DEFAULT_MODDIR)/
+ @for subdir in $(MODULES); do \
+ $(MAKE) -C $$subdir $@; \
+ done
distclean: clean
+ @for subdir in $(MODULES); do \
+ $(MAKE) -C $$subdir $@; \
+ done
rm -f Makefile
-
-clean:
- rm -f */*.o */*.so
Added: trunk/modules/Re/Makefile.in
===================================================================
--- trunk/modules/Re/Makefile.in 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/modules/Re/Makefile.in 2004-03-27 16:46:33 UTC (rev 153)
@@ -0,0 +1,35 @@
+# prothon
+#
+# Copyright (C) 2004 Mark Hahn <[email protected]>
+
+srcdir=@srcdir@
+top_builddir=@top_builddir@
+
+include $(top_builddir)/Rules.mk
+
+HAVE_BOOST_REGEX = @HAVE_BOOST_REGEX@
+BOOST_REGEX_LIBS = @BOOST_REGEX_LIBS@
+
+MODULE_NAME=Re
+
+ifneq ($(HAVE_BOOST_REGEX),)
+TARGET = $(MODULE_NAME).la
+else
+TARGET =
+endif
+
+OBJS = $(MODULE_NAME).lo
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@
+
+install: $(TARGET)
+ $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/
+
+distclean: clean
+ rm -f Makefile
+
+clean:
+ rm -fr *.o *.lo *.la .libs
Added: trunk/modules/String/Makefile.in
===================================================================
--- trunk/modules/String/Makefile.in 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/modules/String/Makefile.in 2004-03-27 16:46:33 UTC (rev 153)
@@ -0,0 +1,28 @@
+# prothon
+#
+# Copyright (C) 2004 Mark Hahn <[email protected]>
+
+srcdir=@srcdir@
+top_builddir=@top_builddir@
+
+include $(top_builddir)/Rules.mk
+
+MODULE_NAME=String
+
+TARGET = $(MODULE_NAME).la
+
+OBJS = $(MODULE_NAME).lo
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@
+
+install: $(TARGET)
+ $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/
+
+distclean: clean
+ rm -f Makefile
+
+clean:
+ rm -fr *.o *.lo *.la .libs
Added: trunk/modules/Tuple/Makefile.in
===================================================================
--- trunk/modules/Tuple/Makefile.in 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/modules/Tuple/Makefile.in 2004-03-27 16:46:33 UTC (rev 153)
@@ -0,0 +1,28 @@
+# prothon
+#
+# Copyright (C) 2004 Mark Hahn <[email protected]>
+
+srcdir=@srcdir@
+top_builddir=@top_builddir@
+
+include $(top_builddir)/Rules.mk
+
+MODULE_NAME=Tuple
+
+TARGET = $(MODULE_NAME).la
+
+OBJS = $(MODULE_NAME).lo
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@
+
+install: $(TARGET)
+ $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/
+
+distclean: clean
+ rm -f Makefile
+
+clean:
+ rm -fr *.o *.lo *.la .libs
Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2004-03-27 14:26:41 UTC (rev 152)
+++ trunk/src/Makefile.in 2004-03-27 16:46:33 UTC (rev 153)
@@ -2,13 +2,11 @@
#
# Copyright (C) 2004 Mark Hahn <[email protected]>
-top_srcdir=@top_srcdir@
+top_builddir=@top_srcdir@
srcdir=@srcdir@
-VPATH = @srcdir@
+include $(top_builddir)/Rules.mk
-include ../Rules.mk
-
TARGET=prothon
OBJS = argproc.o clist.o lock.o memory_mgr.o parser.o prmalloc.o sys.o \
builtins.o interp.o main.o object.o parser_routines.o symbol.o \
@@ -17,7 +15,7 @@
all: $(TARGET)
$(TARGET): $(OBJS)
- $(LD) $(LDFLAGS) $(LIBS) $(OBJS) -o $@
+ $(LINK) $(OBJS) -o $@
install: $(TARGET)
$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
@@ -26,7 +24,7 @@
rm -f Makefile parser.c
clean:
- rm -f *.o $(TARGET) core
+ rm -fr *.o *.lo .libs $(TARGET) core
parser.c: prothon.y
$(YACC) -o $@ $<