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 9f984f1..0e010f1 100644 (file)
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -1,20 +1,13 @@
-## $Id$
-
 AUTOMAKE_OPTIONS = foreign
 
-if USE_OUR_ONCRPC
-RPC_CFLAGS = -I${top_srcdir}/oncrpc
-endif
-
 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) $(RPC_CFLAGS)
+mod_shib_13_la_CXXFLAGS = $(APXS_CFLAGS) -I$(APXS_INCLUDE)
 mod_shib_13_la_LDFLAGS = -module -avoid-version
-mod_shib_13_la_LIBADD = \
-  $(top_builddir)/shib/libshib.la \
-  $(top_builddir)/shib-target/libshib-target.la
+mod_shib_13_la_LIBADD = $(LITE_LIBS) \
+  $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
        for la in $(modshib13_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib13dir)/$$la ; done
@@ -22,19 +15,33 @@ 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) $(RPC_CFLAGS)
+mod_shib_20_la_CXXFLAGS = $(APXS2_CFLAGS) -I$(APXS2_INCLUDE)
 mod_shib_20_la_LDFLAGS = -module -avoid-version
-mod_shib_20_la_LIBADD = \
-  $(top_builddir)/shib/libshib.la \
-  $(top_builddir)/shib-target/libshib-target.la
+mod_shib_20_la_LIBADD = $(LITE_LIBS) \
+  $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
        for la in $(modshib20_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib20dir)/$$la ; done
 
 endif
 
-EXTRA_DIST = mod_apache.cpp mod_shib_13.cpp mod_shib_20.cpp mod_shib13.dsp mod_shib20.dsp \
-       resource.h mod_shib_13.rc mod_shib_20.rc
+if BUILD_AP22
+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 = -module -avoid-version
+mod_shib_22_la_LIBADD = $(LITE_LIBS) \
+  $(top_builddir)/shibsp/libshibsp-lite.la
+
+install-exec-hook:
+       for la in $(modshib22_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib22dir)/$$la ; done
+
+endif
+
+EXTRA_DIST = mod_apache.cpp mod_shib_13.cpp mod_shib_20.cpp mod_shib_22.cpp \
+       mod_shib13.vcxproj mod_shib20.vcxproj mod_shib22.vcxproj \
+       resource.h mod_shib_13.rc mod_shib_20.rc mod_shib_22.rc