Fix link and Apache conf install.

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

diff --git a/apache/Makefile.am b/apache/Makefile.am
index 7187e54..2269592 100644 (file)
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -7,10 +7,9 @@ modshib13dir = $(libexecdir)
 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 = -module -avoid-version
+mod_shib_13_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
 mod_shib_13_la_LIBADD = \
-  $(top_builddir)/shib/libshib.la \
-  $(top_builddir)/shib-target/libshib-target.la
+  $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
        for la in $(modshib13_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib13dir)/$$la ; done
@@ -22,10 +21,9 @@ modshib20dir = $(libexecdir)
 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 = -module -avoid-version
+mod_shib_20_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
 mod_shib_20_la_LIBADD = \
-  $(top_builddir)/shib/libshib.la \
-  $(top_builddir)/shib-target/libshib-target.la
+  $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
        for la in $(modshib20_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib20dir)/$$la ; done
@@ -37,10 +35,9 @@ modshib22dir = $(libexecdir)
 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_LDFLAGS = $(LITE_LIBS) -module -avoid-version
 mod_shib_22_la_LIBADD = \
-  $(top_builddir)/shib/libshib.la \
-  $(top_builddir)/shib-target/libshib-target.la
+  $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
        for la in $(modshib22_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib22dir)/$$la ; done