[GNUnet-SVN] r7960 - in GNUnet/src: setup/lib util

[gnunet]

Author: holindho
Date: 2008-11-21 01:14:01 -0700 (Fri, 21 Nov 2008)
New Revision: 7960

Modified:
   GNUnet/src/setup/lib/Makefile.am
   GNUnet/src/util/Makefile.am
Log:
attempy to clean up -ldl mess


Modified: GNUnet/src/setup/lib/Makefile.am
===================================================================
--- GNUnet/src/setup/lib/Makefile.am    2008-11-20 16:31:09 UTC (rev 7959)
+++ GNUnet/src/setup/lib/Makefile.am    2008-11-21 08:14:01 UTC (rev 7960)
@@ -4,29 +4,24 @@
 
 plugindir = $(libdir)/GNUnet
 
-# GNU Gettext support
-LIBS = @LIBINTL@ @LIBS@
-
 lib_LTLIBRARIES = libgnunetsetup.la
 
 if HAVE_GUILE
  GUILE_SRC = \
     gns.c \
     tree.c tree.h
- GUILE_LIB = -lguile
+ GUILE_LIB = -lguile -lgmp
 endif
 
 libgnunetsetup_la_SOURCES = \
-       $(GUILE_SRC) \
+  $(GUILE_SRC) \
   wizard_util.c wizard_util.h
-
+libgnunetsetup_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetsetup_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(GUILE_LIB)
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GUILE_LIB) \
+  $(LTLIBINTL) \
+  $(LIBLTDL) \
+  $(LIBADD_DL)
 
-libgnunetsetup_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS)
-
-libgnunetsetup_la_CFLAGS = -I$(top_scrdir)/include 
-
-

Modified: GNUnet/src/util/Makefile.am
===================================================================
--- GNUnet/src/util/Makefile.am 2008-11-20 16:31:09 UTC (rev 7959)
+++ GNUnet/src/util/Makefile.am 2008-11-21 08:14:01 UTC (rev 7960)
@@ -23,9 +23,6 @@
 AM_CFLAGS = \
   -DPLUGIN_PATH="\"${plugindir}\"" -DPREFIX_PATH="\"${prefix}\""
 
-# GNU Gettext support
-LIBS = @LIBINTL@ @LIBICONV@ @LIBS@
-
 if SOLARIS
  SOLLIBADD = -lrt
 endif
@@ -34,20 +31,8 @@
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 
-luuid -liconv -lstdc++ -lcomdlg32 -lgdi32
  WINSUBDIRS = win
  WINLIBADD = $(top_builddir)/src/util/win/libwin.la 
-else
- DLLIBADD = -ldl
 endif
 
-if XFREEBSD
- DLLIBADD=
-endif
-
-if OPENBSD
- DLLIBADD=
-endif
-
-
-
 if CYGWIN
  CYGSUBDIRS = win
  CYGLIBADD = $(top_builddir)/src/util/win/libwin.la 
@@ -59,35 +44,35 @@
 
 lib_LTLIBRARIES = libgnunetutil.la
 
+libgnunetutil_la_SOURCES = libgnunetutil.c
 libgnunetutil_la_LIBADD = \
- boot/libboot.la \
- config/libconfig.la \
- containers/libcontainers.la \
- cron/libcron.la \
- crypto/libcrypto.la \
- disk/libdisk.la \
- error/liberror.la \
- getopt/libgetopt.la \
- loggers/libloggers.la \
- string/libstring.la \
- network/libnetwork.la \
- network_client/libnetwork_client.la \
- os/libos.la \
- pseudonym/libpseudonym.la \
- threads/libthreads.la \
- $(GCLIBADD) $(CYGLIBADD) $(WINLIBADD) \
- $(LIBGCRYPT_LIBS) \
- -lgmp \
- $(LIBLTDL) \
- $(SOLLIBADD) \
- $(DLLIBADD)
+  boot/libboot.la \
+  config/libconfig.la \
+  containers/libcontainers.la \
+  cron/libcron.la \
+  crypto/libcrypto.la \
+  disk/libdisk.la \
+  error/liberror.la \
+  getopt/libgetopt.la \
+  loggers/libloggers.la \
+  string/libstring.la \
+  network/libnetwork.la \
+  network_client/libnetwork_client.la \
+  os/libos.la \
+  pseudonym/libpseudonym.la \
+  threads/libthreads.la \
+  $(GCLIBADD) $(CYGLIBADD) $(WINLIBADD) \
+  $(LIBGCRYPT_LIBS) \
+  -lgmp \
+  $(LTLIBINTL) \
+  $(LTLIBICONV) \
+  $(LIBLTDL) \
+  $(LIBADD_DL) \
+  $(SOLLIBADD)
+libgnunetutil_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+  -version-info 3:0:0
 
-libgnunetutil_la_SOURCES = libgnunetutil.c
-
 EXTRA_DIST = \
   check.conf
 
-libgnunetutil_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 3:0:0
-