Skip to content
Snippets Groups Projects
Commit b056ad25 authored by edgrif's avatar edgrif
Browse files

disable libtool from trying to build shared libs for zmap stuff.

parent 4d3bdffa
No related branches found
No related tags found
No related merge requests found
......@@ -47,20 +47,23 @@ pkgconfig_DATA = zmap.pc
################################################################################
################################################################################
# I've commented out all the -all-static stuff because I think I've done it a
# better way by disabling libtool building of shared libs in configure.ac
# Libraries (These are libtool convenience libraries)
noinst_LTLIBRARIES = libZMapApp.la libZMap.la libZMapThr.la libZMapXML.la libPFetch.la
libZMapXML_la_SOURCES =
libZMapXML_la_LIBADD = zmapXML/libZMapXML.la
libZMapXML_la_LDFLAGS = -all-static
#libZMapXML_la_LDFLAGS = -all-static
libPFetch_la_SOURCES =
libPFetch_la_LIBADD = libpfetch/libpfetch.la libcurlobject/libcurlobject.la
libPFetch_la_LDFLAGS = -all-static
#libPFetch_la_LDFLAGS = -all-static
libZMap_la_SOURCES =
libZMap_la_LDFLAGS = -all-static
#libZMap_la_LDFLAGS = -all-static
libZMap_la_LIBADD = \
zmapControl/libZMapControl.la \
zmapConfig/libZMapConfig.la \
......@@ -76,10 +79,10 @@ $(NULL)
libZMapApp_la_SOURCES =
libZMapApp_la_LIBADD = zmapApp/libZMapApp.la
libZMapApp_la_LDFLAGS = -all-static
#libZMapApp_la_LDFLAGS = -all-static
libZMapThr_la_SOURCES =
libZMapThr_la_LDFLAGS = -all-static
#libZMapThr_la_LDFLAGS = -all-static
libZMapThr_la_LIBADD = \
zmapServer/libZMapServer.la \
zmapServer/libZMapServers.la \
......@@ -139,7 +142,7 @@ check_LTLIBRARIES = libcheckZMap.la
libcheckZMap_la_DEPENDENCIES = $(noinst_LTLIBRARIES) $(libcheckZMap_la_LIBADD)
libcheckZMap_la_SOURCES =
libcheckZMap_la_LDFLAGS = -all-static
#libcheckZMap_la_LDFLAGS = -all-static
libcheckZMap_la_LIBADD = \
libpfetch/tests/libcheckPFetch.la \
zmapFeature/tests/libcheckZMapFeature.la \
......
......@@ -116,6 +116,9 @@ AC_SUBST(ZMAP_DOXY_HTML_HEADER)
AC_SUBST(ZMAP_DOXY_HTML_FOOTER)
dnl Disable shared libs so foocanvas is bound in to zmap.
AC_DISABLE_SHARED
AC_PROG_LIBTOOL
AM_INIT_AUTOMAKE
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment