Hopefully proper use of LIBADD to fix LDFLAG ordering problems.

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

diff --git a/apache/Makefile.am b/apache/Makefile.am
index 2269592..0e010f1 100644 (file)
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -1,14 +1,12 @@
-## $Id$
-
 AUTOMAKE_OPTIONS = foreign
 
 if BUILD_AP13
-modshib13dir = $(libexecdir)
+modshib13dir = $(libdir)/@PACKAGE@
 modshib13_LTLIBRARIES = mod_shib_13.la
 mod_shib_13_la_SOURCES = mod_shib_13.cpp
 mod_shib_13_la_CXXFLAGS = $(APXS_CFLAGS) -I$(APXS_INCLUDE)
-mod_shib_13_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
-mod_shib_13_la_LIBADD = \
+mod_shib_13_la_LDFLAGS = -module -avoid-version
+mod_shib_13_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
@@ -17,12 +15,12 @@ install-exec-hook:
 endif
 
 if BUILD_AP20
-modshib20dir = $(libexecdir)
+modshib20dir = $(libdir)/@PACKAGE@
 modshib20_LTLIBRARIES = mod_shib_20.la
 mod_shib_20_la_SOURCES = mod_shib_20.cpp
 mod_shib_20_la_CXXFLAGS = $(APXS2_CFLAGS) -I$(APXS2_INCLUDE)
-mod_shib_20_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
-mod_shib_20_la_LIBADD = \
+mod_shib_20_la_LDFLAGS = -module -avoid-version
+mod_shib_20_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
@@ -31,12 +29,12 @@ install-exec-hook:
 endif
 
 if BUILD_AP22
-modshib22dir = $(libexecdir)
+modshib22dir = $(libdir)/@PACKAGE@
 modshib22_LTLIBRARIES = mod_shib_22.la
 mod_shib_22_la_SOURCES = mod_shib_22.cpp
 mod_shib_22_la_CXXFLAGS = $(APXS22_CFLAGS) -I$(APXS22_INCLUDE)
-mod_shib_22_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
-mod_shib_22_la_LIBADD = \
+mod_shib_22_la_LDFLAGS = -module -avoid-version
+mod_shib_22_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
@@ -45,5 +43,5 @@ install-exec-hook:
 endif
 
 EXTRA_DIST = mod_apache.cpp mod_shib_13.cpp mod_shib_20.cpp mod_shib_22.cpp \
-       mod_shib13.vcproj mod_shib20.vcproj mod_shib22.vcproj \
+       mod_shib13.vcxproj mod_shib20.vcxproj mod_shib22.vcxproj \
        resource.h mod_shib_13.rc mod_shib_20.rc mod_shib_22.rc