Author: biurrun Date: Thu Oct 15 13:51:32 2009 New Revision: 1159 Log: Get rid of overcomplicated and pointless linker flag settings. Modified: trunk/community-operator/Makefile.am trunk/configure.ac trunk/pairing/Makefile.am trunk/pisacd/Makefile.am trunk/pisand/Makefile.am trunk/pisasd/Makefile.am trunk/test/Makefile.am Modified: trunk/community-operator/Makefile.am ============================================================================== --- trunk/community-operator/Makefile.am Thu Oct 15 13:46:14 2009 (r1158) +++ trunk/community-operator/Makefile.am Thu Oct 15 13:51:32 2009 (r1159) @@ -8,18 +8,7 @@ co_serverdir = . co_clientdir = . -LDADD = -LDFLAGS = @LDFLAGS@ - -if PISA_FORCE_SHLIB - LDADD += -lpisa -lconfig -else -if PISA_FORCE_SHLIBCONFIG - LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig -else - LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@ -endif -endif +LDFLAGS += -lpisa -lm if PISA_WITH_HIPL # Things needed for compiling hipl-related codes @@ -34,14 +23,11 @@ INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjlib-util/include endif -co_server_LDADD = $(LDADD) -lm -lcrypto if PISA_WITH_HIPL -co_server_LDADD += @PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a +co_server_LDADD = @PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a co_server_LDADD += @PISA_HIPL_SRCDIR@/libhiptool/.libs/libhiptool.a endif co_server_SOURCES = co_server.c hipl.c - -co_client_LDADD = $(LDADD) -lm -lcrypto co_client_SOURCES = co_client.c include_HEADERS = hipl.h Modified: trunk/configure.ac ============================================================================== --- trunk/configure.ac Thu Oct 15 13:46:14 2009 (r1158) +++ trunk/configure.ac Thu Oct 15 13:51:32 2009 (r1159) @@ -164,11 +164,6 @@ AC_SUBST(PISA_LIBPISA_LIB_STATIC, "$PISA_LIBPISA_LIB/libpisa.a") AC_SUBST(PISA_LIBPISA_LIB_DYNAMIC, "$PISA_LIBPISA_LIB/libpisa.so") -AC_SUBST(PISA_LIBCONFIG, "/usr/lib") -AC_SUBST(PISA_LIBCONFIG_LIB, "$PISA_LIBCONFIG") -AC_SUBST(PISA_LIBCONFIG_LIB_STATIC, "$PISA_LIBCONFIG_LIB/libconfig.a") -AC_SUBST(PISA_LIBCONFIG_LIB_DYNAMIC, "$PISA_LIBCONFIG_LIB/libconfig.so") - AC_SUBST(PISA_PISACD, "$TOPSRC/pisacd") AC_SUBST(PISA_PISACD_INCLUDES, "$PISA_PISACD") AC_SUBST(PISA_PISAND, "$TOPSRC/pisand") Modified: trunk/pairing/Makefile.am ============================================================================== --- trunk/pairing/Makefile.am Thu Oct 15 13:46:14 2009 (r1158) +++ trunk/pairing/Makefile.am Thu Oct 15 13:51:32 2009 (r1159) @@ -21,19 +21,8 @@ defaults/authorized_hosts.cfg defaults/known_relays.cfg defaults/relay_config.cfg \ defaults/sha.txt defaults/user_config.cfg -LDADD = -lcrypto -LDFLAGS = @LDFLAGS@ +LDFLAGS += -lcrypto -lpisa -lconfig -lm -if PISA_FORCE_SHLIB - LDADD += -lpisa -lconfig -lm -else -if PISA_FORCE_SHLIBCONFIG - LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig -else - LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@ -endif -endif - COMMON_SRCS = common.c common_headers.c libconfig_wrapper.c ACCEPT_SEND_SRCS = hash.c packet_handler.c $(COMMON_SRCS) Modified: trunk/pisacd/Makefile.am ============================================================================== --- trunk/pisacd/Makefile.am Thu Oct 15 13:46:14 2009 (r1158) +++ trunk/pisacd/Makefile.am Thu Oct 15 13:51:32 2009 (r1159) @@ -13,24 +13,8 @@ pisacddir = . -LDADD = -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -lpisa -lconfig -lm -if PISA_FORCE_SHLIB - LDADD += -lpisa -lconfig -else -if PISA_FORCE_SHLIBCONFIG - LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig -else - LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@ -endif -endif - -if PISA_PERFORMANCE - LDADD += @PISA_PERFORMANCE_LIB_STATIC@ -endif - -LDADD += -lm pisacd_SOURCES = cdmain.c cdconf.c cdconmgr.c cdctx.c cdderegister.c \ cdheartbeat.c cdmsg.c cdpending.c cdregister.c cdservers.c \ cdtimeout.c cdtun.c pisacdconf.c cdconfhandlers.c Modified: trunk/pisand/Makefile.am ============================================================================== --- trunk/pisand/Makefile.am Thu Oct 15 13:46:14 2009 (r1158) +++ trunk/pisand/Makefile.am Thu Oct 15 13:51:32 2009 (r1159) @@ -12,22 +12,7 @@ pisanddir = . -LDADD = -lm -LDFLAGS = @LDFLAGS@ - -if PISA_FORCE_SHLIB - LDADD += -lpisa -lconfig -else -if PISA_FORCE_SHLIBCONFIG - LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig -else - LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@ -endif -endif - -if PISA_PERFORMANCE - LDADD += @PISA_PERFORMANCE_LIB_STATIC@ -endif +LDFLAGS += -lpisa -lconfig -lm pisand_SOURCES = ndmain.c ndconf.c ndconmgr.c ndctx.c ndmsg.c neighbor.c include_HEADERS = ndconf.h ndconmgr.h ndctx.h ndmsg.h neighbor.h Modified: trunk/pisasd/Makefile.am ============================================================================== --- trunk/pisasd/Makefile.am Thu Oct 15 13:46:14 2009 (r1158) +++ trunk/pisasd/Makefile.am Thu Oct 15 13:51:32 2009 (r1159) @@ -14,24 +14,8 @@ pisasddir = . pisaconfdir = . -LDADD = -LDFLAGS = @LDFLAGS@ +LDFLAGS += -lpisa -lconfig -lm -if PISA_FORCE_SHLIB - LDADD += -lpisa -lconfig -else -if PISA_FORCE_SHLIBCONFIG - LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig -else - LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@ -endif -endif - -if PISA_PERFORMANCE - LDADD += @PISA_PERFORMANCE_LIB_STATIC@ -endif - -LDADD += -lm pisasd_SOURCES = sdmain.c sdclients.c sdconf.c sdctx.c sdderegister.c \ sdheartbeat.c sdmsg.c sdregister.c sdtun.c pisasdconf.c \ sdnat.c Modified: trunk/test/Makefile.am ============================================================================== --- trunk/test/Makefile.am Thu Oct 15 13:46:14 2009 (r1158) +++ trunk/test/Makefile.am Thu Oct 15 13:51:32 2009 (r1159) @@ -40,18 +40,7 @@ EXTRA_DIST += packaging/rh-init.d-pisand EXTRA_DIST += packaging/rh-init.d-pisasd -LDADD = -lm -LDFLAGS = @LDFLAGS@ - -if PISA_FORCE_SHLIB - LDADD += -lpisa -lconfig -else -if PISA_FORCE_SHLIBCONFIG - LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig -else - LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@ -endif -endif +LDFLAGS += -lpisa -lconfig -lm checkhipd_SOURCES = checkhipd.c getns_SOURCES = getns.c @@ -78,7 +67,7 @@ if PISA_PREAUTH hipl_SOURCES = hipl.c -hipl_LDADD = -lm -lcrypto +hipl_LDADD = -lcrypto if PISA_WITH_HIPL hipl_LDADD += @PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a