diff options
| author | Matthias Schiffer <matthias@gamezock.de> | 2008-12-22 12:34:54 +0100 |
|---|---|---|
| committer | Matthias Schiffer <matthias@gamezock.de> | 2008-12-22 12:34:54 +0100 |
| commit | 5e8b56644fa132287431cb06717cdfe0ea05dfbc (patch) | |
| tree | 25f21471b5ba486dcd97d7e57a07f19b243bdc41 /src | |
| parent | 33ecd8fa230f1b50165121747c1e68a922c08909 (diff) | |
| download | mad-5e8b56644fa132287431cb06717cdfe0ea05dfbc.tar mad-5e8b56644fa132287431cb06717cdfe0ea05dfbc.zip | |
Module mit LDADD, nicht mit LDFLAGS uebergeben
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/Makefile.in | 23 |
2 files changed, 21 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 529200f..a9027b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = mad madc mad-core mad_SOURCES = mad.cpp mad_LDADD = Daemon/libdaemon.la Common/libcommon.la Net/libnet.la \ - $(sigc_LIBS) $(GnuTLS_LIBS) @LIBLTDL@ -mad_LDFLAGS = -export-dynamic $(daemon_modules) + $(sigc_LIBS) $(GnuTLS_LIBS) @LIBLTDL@ $(daemon_modules) +mad_LDFLAGS = -export-dynamic madc_SOURCES = madc.cpp madc_LDADD = Client/libclient.la Common/libcommon.la Net/libnet.la \ @@ -30,5 +30,5 @@ madc_LDADD = Client/libclient.la Common/libcommon.la Net/libnet.la \ mad_core_SOURCES = mad-core.cpp mad_core_LDADD = Core/libcore.la Common/libcommon.la Net/libnet.la \ - $(sigc_LIBS) $(GnuTLS_LIBS) $(GSSAPI_LIBS) @LIBLTDL@ -mad_core_LDFLAGS = -export-dynamic $(core_modules) + $(sigc_LIBS) $(GnuTLS_LIBS) $(GSSAPI_LIBS) @LIBLTDL@ $(core_modules) +mad_core_LDFLAGS = -export-dynamic diff --git a/src/Makefile.in b/src/Makefile.in index 3d29ff8..13da2ee 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -58,16 +58,27 @@ PROGRAMS = $(bin_PROGRAMS) am_mad_OBJECTS = mad.$(OBJEXT) mad_OBJECTS = $(am_mad_OBJECTS) am__DEPENDENCIES_1 = +@SYSTEMBACKEND_POSIX_TRUE@am__DEPENDENCIES_2 = \ +@SYSTEMBACKEND_POSIX_TRUE@ modules/SystemBackendPosix.la +@SYSTEMBACKEND_PROC_TRUE@am__DEPENDENCIES_3 = \ +@SYSTEMBACKEND_PROC_TRUE@ modules/SystemBackendProc.la +am__DEPENDENCIES_4 = modules/FileLogger.la $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_3) mad_DEPENDENCIES = Daemon/libdaemon.la Common/libcommon.la \ - Net/libnet.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + Net/libnet.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_4) mad_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(mad_LDFLAGS) \ $(LDFLAGS) -o $@ am_mad_core_OBJECTS = mad-core.$(OBJEXT) mad_core_OBJECTS = $(am_mad_core_OBJECTS) +@USERBACKEND_MYSQL_TRUE@am__DEPENDENCIES_5 = \ +@USERBACKEND_MYSQL_TRUE@ modules/UserBackendMysql.la +am__DEPENDENCIES_6 = modules/FileLogger.la $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_5) mad_core_DEPENDENCIES = Core/libcore.la Common/libcommon.la \ Net/libnet.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) mad_core_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(mad_core_LDFLAGS) $(LDFLAGS) -o $@ @@ -252,18 +263,18 @@ core_modules = -dlpreopen modules/FileLogger.la $(am__append_2) \ $(am__append_4) $(am__append_5) mad_SOURCES = mad.cpp mad_LDADD = Daemon/libdaemon.la Common/libcommon.la Net/libnet.la \ - $(sigc_LIBS) $(GnuTLS_LIBS) @LIBLTDL@ + $(sigc_LIBS) $(GnuTLS_LIBS) @LIBLTDL@ $(daemon_modules) -mad_LDFLAGS = -export-dynamic $(daemon_modules) +mad_LDFLAGS = -export-dynamic madc_SOURCES = madc.cpp madc_LDADD = Client/libclient.la Common/libcommon.la Net/libnet.la \ $(sigc_LIBS) $(GnuTLS_LIBS) $(READLINE_LIBS) mad_core_SOURCES = mad-core.cpp mad_core_LDADD = Core/libcore.la Common/libcommon.la Net/libnet.la \ - $(sigc_LIBS) $(GnuTLS_LIBS) $(GSSAPI_LIBS) @LIBLTDL@ + $(sigc_LIBS) $(GnuTLS_LIBS) $(GSSAPI_LIBS) @LIBLTDL@ $(core_modules) -mad_core_LDFLAGS = -export-dynamic $(core_modules) +mad_core_LDFLAGS = -export-dynamic all: all-recursive .SUFFIXES: |