* tests/standalone.at: (without autotools): Add

$(CFLAGS) to LTCOMPILE and LTLINK. Separate compiling
and linking. Remove compiling flags from link. Add
--tag. Add -no-undefined flag.

diff --git a/ChangeLog b/ChangeLog
index 3b9df6c51c1b81bc3b65892841397e0ec0aa0589..961cf980e2309f556255e014afa3c8ef793ac641 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-25  Peter Ekberg  <peda@lysator.liu.se>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * tests/standalone.at: (without autotools): Add
+       $(CFLAGS) to LTCOMPILE and LTLINK. Separate compiling
+       and linking. Remove compiling flags from link. Add
+       --tag. Add -no-undefined flag.
+
 2005-08-24  Bruno Haible  <bruno@clisp.org>
 
        * libltdl/config/ltmain.sh (func_mode_install): Try "ln -s -f"

diff --git a/tests/standalone.at b/tests/standalone.at
index d4951ce21966270a1d35b98e15fd160f6dc4e216..39c955099ba17a08da3f592fe4fffd4fa333211e 100644 (file)
--- a/tests/standalone.at
+++ b/tests/standalone.at
@@ -123,20 +123,25 @@ finish:
 AT_DATA([Makefile],
 [[LIBTOOL      = ./libltdl/libtool
 INCLUDES       = -I./libltdl
-MODFLAGS       = -module -avoid-version
+MODFLAGS       = -module -avoid-version -no-undefined
 
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(INCLUDES)
-LTLINK   = $(LIBTOOL) --mode=link $(CC) $(CPPFLAGS) $(INCLUDES) $(LDFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(LIBTOOLFLAGS) --mode=compile \
+        $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LTLINK    = $(LIBTOOL) --tag=CC $(LIBTOOLFLAGS) --mode=link \
+        $(CC) $(CFLAGS) $(LDFLAGS)
 
-TARGETS                = libltdl/libltdlc.la module.la ltdldemo
+TARGETS                = libltdl/libltdlc.la module.la ltdldemo$(EXEEXT)
 
 all: $(TARGETS)
 
 $(LIBTOOL) libltdl/libltdlc.la:
        cd libltdl && ./configure && $(MAKE)
 
-ltdldemo: $(LIBTOOL) module.la libltdl/libltdlc.la main.c
-       $(LTLINK) -o ltdldemo main.c -dlopen module.la ./libltdl/libltdlc.la
+ltdldemo$(EXEEXT): $(LIBTOOL) module.la libltdl/libltdlc.la main.lo
+       $(LTLINK) -o ltdldemo main.lo -dlopen module.la ./libltdl/libltdlc.la
+
+main.lo: $(LIBTOOL) main.c
+       $(LTCOMPILE) -c main.c
 
 module.la: $(LIBTOOL) module.lo
        $(LTLINK) -o module.la module.lo $(MODFLAGS) -rpath /dev/null
@@ -146,7 +151,8 @@ module.lo: $(LIBTOOL) module.c
 ]])
 
 LT_AT_LIBTOOLIZE([--copy --ltdl])
-${MAKE-make} CC="$CC" CPPFLAGS="$CPPFLAGS" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+${MAKE-make} CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \
+        CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 
 AT_DATA([expout],
 [[Hello!