Hopefully proper use of LIBADD to fix LDFLAG ordering problems.

[shibboleth/sp.git] / adfs / Makefile.am

diff --git a/adfs/Makefile.am b/adfs/Makefile.am
index 8c16b49..cd3ade5 100644 (file)
--- a/adfs/Makefile.am
+++ b/adfs/Makefile.am
@@ -1,27 +1,25 @@
-## $Id$\r
-\r
-AUTOMAKE_OPTIONS = foreign\r
-\r
-plugindir = $(libexecdir)\r
-plugin_LTLIBRARIES = adfs.la adfs-lite.la\r
-\r
-adfs_la_LIBADD = \\r
-       $(top_builddir)/shibsp/libshibsp.la\r
-\r
-adfs_la_SOURCES = \\r
-       adfs.cpp\r
-\r
-adfs_lite_la_LIBADD = \\r
-       $(top_builddir)/shibsp/libshibsp-lite.la\r
-\r
-adfs_lite_la_SOURCES = \\r
-       adfs.cpp\r
-\r
-adfs_la_LDFLAGS = -module -avoid-version $(XMLSEC_LIBS)\r
-adfs_lite_la_LDFLAGS = -module -avoid-version $(LITE_LIBS)\r
-adfs_lite_la_CPPFLAGS = -DSHIBSP_LITE\r
-\r
-install-exec-hook:\r
-       for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done\r
-\r
-EXTRA_DIST = adfs.vcproj adfs-lite.vcproj resource.h adfs.rc\r
+AUTOMAKE_OPTIONS = foreign
+
+plugindir = $(libdir)/@PACKAGE@
+plugin_LTLIBRARIES = adfs.la adfs-lite.la
+
+adfs_la_LIBADD = $(XMLSEC_LIBS) \
+       $(top_builddir)/shibsp/libshibsp.la
+
+adfs_la_SOURCES = \
+       adfs.cpp
+
+adfs_lite_la_LIBADD = $(LITE_LIBS) \
+       $(top_builddir)/shibsp/libshibsp-lite.la
+
+adfs_lite_la_SOURCES = \
+       adfs.cpp
+
+adfs_la_LDFLAGS = -module -avoid-version
+adfs_lite_la_LDFLAGS = -module -avoid-version
+adfs_lite_la_CPPFLAGS = -DSHIBSP_LITE
+
+install-exec-hook:
+       for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
+
+EXTRA_DIST = adfs.vcxproj adfs-lite.vcxproj resource.h adfs.rc