* doc/Makefile.am: Stop abusing _LDFLAGS

* examples/Makefile.am:
* examples/jpeg/Makefile.am:
* examples/md5/Makefile.am:
* examples/uberopt/Makefile.am:
* liboil/Makefile.am:
* testsuite/Makefile.am:

8 files changed, 29 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index dfcfc23..6612664 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-01-31  David Schleef  <ds@schleef.org>
+
+	* doc/Makefile.am: Stop abusing _LDFLAGS
+	* examples/Makefile.am:
+	* examples/jpeg/Makefile.am:
+	* examples/md5/Makefile.am:
+	* examples/uberopt/Makefile.am:
+	* liboil/Makefile.am:
+	* testsuite/Makefile.am:
+
 2005-01-18  David Schleef  <ds@schleef.org>
 
 	* Makefile.am: documentation.  woohoo.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4e6f730..cfc4c7a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -193,7 +193,7 @@ noinst_PROGRAMS = build_prototypes_doc
 
 build_prototypes_doc_SOURCES = build_prototypes_doc.c
 build_prototypes_doc_CFLAGS = $(LIBOIL_CFLAGS)
-build_prototypes_doc_LDFLAGS = $(LIBOIL_LIBS)
+build_prototypes_doc_LDADD = $(LIBOIL_LIBS)
 
 liboilfuncs-doc.h:
 	./build_prototypes_doc >liboilfuncs-doc.h
diff --git a/examples/Makefile.am b/examples/Makefile.am
index b58ac02..ae1a990 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -6,9 +6,9 @@ noinst_PROGRAMS = example1 oil-inspect
 
 example1_SOURCES = example1.c
 example1_CFLAGS = $(LIBOIL_CFLAGS)
-example1_LDFLAGS = $(LIBOIL_LIBS)
+example1_LDADD = $(LIBOIL_LIBS)
 
 oil_inspect_SOURCES = oil-inspect.c
 oil_inspect_CFLAGS = $(LIBOIL_CFLAGS)
-oil_inspect_LDFLAGS = $(LIBOIL_LIBS)
+oil_inspect_LDADD = $(LIBOIL_LIBS)
 
diff --git a/examples/jpeg/Makefile.am b/examples/jpeg/Makefile.am
index b9f886e..4364976 100644
--- a/examples/jpeg/Makefile.am
+++ b/examples/jpeg/Makefile.am
@@ -10,7 +10,7 @@ endif
 
 libjpeg_la_SOURCES = jpeg.c huffman.c jpeg_rgb_decoder.c
 libjpeg_la_CFLAGS = $(GLIB_CFLAGS) $(LIBOIL_CFLAGS)
-libjpeg_la_LDFLAGS = -lm $(GLIB_LIBS)
+libjpeg_la_LIBADD = -lm $(GLIB_LIBS)
 
 noinst_HEADERS = bits.h huffman.h jpeg.h jpeg_debug.h \
 	jpeg_internal.h jpeg_rgb_decoder.h jpeg_rgb_internal.h
@@ -19,11 +19,9 @@ noinst_HEADERS = bits.h huffman.h jpeg.h jpeg_debug.h \
 
 jpeg_test_SOURCES = test.c
 jpeg_test_CFLAGS = $(GLIB_CFLAGS) $(LIBOIL_CFLAGS)
-jpeg_test_LDFLAGS = -lm $(GLIB_LIBS) $(LIBOIL_LIBS)
-jpeg_test_LDADD = libjpeg.la
+jpeg_test_LDADD = libjpeg.la -lm $(GLIB_LIBS) $(LIBOIL_LIBS)
 
 jpeg_rgb_test_SOURCES = test_rgb.c
 jpeg_rgb_test_CFLAGS = $(GLIB_CFLAGS) $(LIBOIL_CFLAGS)
-jpeg_rgb_test_LDFLAGS = -lm $(GLIB_LIBS) $(LIBOIL_LIBS)
-jpeg_rgb_test_LDADD = libjpeg.la
+jpeg_rgb_test_LDADD = libjpeg.la -lm $(GLIB_LIBS) $(LIBOIL_LIBS)
 
diff --git a/examples/md5/Makefile.am b/examples/md5/Makefile.am
index 826806d..75918c1 100644
--- a/examples/md5/Makefile.am
+++ b/examples/md5/Makefile.am
@@ -4,5 +4,5 @@ noinst_PROGRAMS = md5sum
 
 md5sum_SOURCES = md5sum.c
 md5sum_CFLAGS = $(LIBOIL_CFLAGS)
-md5sum_LDFLAGS = $(LIBOIL_LIBS)
+md5sum_LDADD = $(LIBOIL_LIBS)
 
diff --git a/examples/uberopt/Makefile.am b/examples/uberopt/Makefile.am
index f718517..d399fd3 100644
--- a/examples/uberopt/Makefile.am
+++ b/examples/uberopt/Makefile.am
@@ -10,5 +10,5 @@ endif
 
 uberopt_SOURCES = uberopt.c
 uberopt_CFLAGS = $(LIBOIL_CFLAGS) $(GLIB_CFLAGS)
-uberopt_LDFLAGS = $(LIBOIL_LIBS) $(GLIB_LIBS)
+uberopt_LDADD = $(LIBOIL_LIBS) $(GLIB_LIBS)
 
diff --git a/liboil/Makefile.am b/liboil/Makefile.am
index 5d4ea20..4a36149 100644
--- a/liboil/Makefile.am
+++ b/liboil/Makefile.am
@@ -18,7 +18,6 @@ CLEANFILES = liboilarray.c
 liboilfunctions_la_SOURCES = \
 	null.c
 liboilfunctions_la_CFLAGS = $(LIBOIL_CFLAGS)
-liboilfunctions_la_LDFLAGS = -lm
 liboilfunctions_la_LIBADD = \
 	conv/libconv.la \
 	colorspace/libcolorspace.la \
@@ -26,13 +25,15 @@ liboilfunctions_la_LIBADD = \
 	dct/libdct.la \
 	jpeg/libjpeg.la \
 	md5/libmd5.la \
-	simdpack/libsimdpack.la
+	simdpack/libsimdpack.la \
+	-lm
 
 liboiltmp1_la_SOURCES =
-liboiltmp1_la_LDFLAGS = -lm \
+liboiltmp1_la_LDFLAGS = \
 	-export-symbols-regex 'oil_'
 liboiltmp1_la_LIBADD = \
-	liboilfunctions.la
+	liboilfunctions.la \
+	-lm
 
 liboil_@LIBOIL_MAJORMINOR@_la_SOURCES = \
 	liboil.h \
@@ -51,9 +52,10 @@ liboil_@LIBOIL_MAJORMINOR@_la_SOURCES = \
 	liboiltest.c \
 	liboilmarshal.c
 liboil_@LIBOIL_MAJORMINOR@_la_LIBADD = \
-	liboilfunctions.la
+	liboilfunctions.la \
+	-lm
 liboil_@LIBOIL_MAJORMINOR@_la_CFLAGS = $(LIBOIL_CFLAGS)
-liboil_@LIBOIL_MAJORMINOR@_la_LDFLAGS = -lm \
+liboil_@LIBOIL_MAJORMINOR@_la_LDFLAGS = \
 	-version-info $(LIBOIL_LIBVERSION) \
 	-export-symbols-regex '^oil_'
 
@@ -63,13 +65,13 @@ build_prototypes_DEPENDENCIES = liboil-$(LIBOIL_MAJORMINOR).la
 
 build_prototypes_SOURCES = build_prototypes.c
 build_prototypes_CFLAGS = $(LIBOIL_CFLAGS)
-build_prototypes_LDFLAGS = $(LIBOIL_LIBS)
+build_prototypes_LDADD = $(LIBOIL_LIBS)
 
 build_marshal_DEPENDENCIES = liboil-$(LIBOIL_MAJORMINOR).la
 
 build_marshal_SOURCES = build_marshal.c
 build_marshal_CFLAGS = $(LIBOIL_CFLAGS)
-build_marshal_LDFLAGS = $(LIBOIL_LIBS)
+build_marshal_LDADD = $(LIBOIL_LIBS)
 
 liboilarray.c: liboiltmp1.la Makefile
 	echo '/* This file is autogenerated.  Do not edit */' >liboilarray.c
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index c144778..0bc4c72 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -5,7 +5,7 @@ else
 glib_programs =
 endif
 
-programs = moo introspect proto1 proto2 test1 proto3 proto4 stride
+programs = moo introspect proto1 proto2 test1 proto3 proto4 stride dso_check
 
 check_PROGRAMS = $(programs) $(glib_programs)