[GNUnet-SVN] r21657 - in gnunet: . src/gns src/gns/nss

[gnunet]

Author: grothoff
Date: 2012-05-31 16:23:27 +0200 (Thu, 31 May 2012)
New Revision: 21657

Modified:
   gnunet/configure.ac
   gnunet/src/gns/Makefile.am
   gnunet/src/gns/nss/Makefile.am
Log:
-adjusting makefile to install NSS libraries of GNS

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-05-31 14:23:15 UTC (rev 21656)
+++ gnunet/configure.ac 2012-05-31 14:23:27 UTC (rev 21657)
@@ -1013,6 +1013,7 @@
 src/fs/fs.conf
 src/gns/Makefile
 src/gns/gns.conf
+src/gns/nss/Makefile
 src/hello/Makefile
 src/include/Makefile
 src/include/gnunet_directories.h

Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2012-05-31 14:23:15 UTC (rev 21656)
+++ gnunet/src/gns/Makefile.am  2012-05-31 14:23:27 UTC (rev 21657)
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
-#SUBDIRS=nss
+SUBDIRS = . nss
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols

Modified: gnunet/src/gns/nss/Makefile.am
===================================================================
--- gnunet/src/gns/nss/Makefile.am      2012-05-31 14:23:15 UTC (rev 21656)
+++ gnunet/src/gns/nss/Makefile.am      2012-05-31 14:23:27 UTC (rev 21657)
@@ -19,17 +19,17 @@
 
 EXTRA_DIST = map-file
 
-# This cool debug trap works on i386/gcc only
-AM_CFLAGS='-DDEBUG_TRAP=__asm__("int $$3")'
-
 AM_LDFLAGS=-avoid-version -module -export-dynamic
 
-lib_LTLIBRARIES = 
+nssdir = /lib/
+LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
 
-lib_LTLIBRARIES += \
+if !MINGW
+nss_LTLIBRARIES = \
        libnss_gns.la \
        libnss_gns4.la \
        libnss_gns6.la
+endif
 
 sources = util.c util.h query.h query.c
 
@@ -46,12 +46,9 @@
 libnss_gns6_la_CFLAGS=$(libnss_gns_la_CFLAGS) -DNSS_IPV6_ONLY=1
 libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS)
 
-install-exec-hook:
-       rm -f $(DESTDIR)$(libdir)/libnss_gns.la 
-       rm -f $(DESTDIR)$(libdir)/libnss_gns4.la 
-       rm -f $(DESTDIR)$(libdir)/libnss_gns6.la 
+install-data-hook:
+       $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool --finish $(nssdir)
+       $(SUDO_BINARY) rm -f $(nssdir)/libnss_gns.la $(nssdir)/libnss_gns4.la 
$(nssdir)/libnss_gns6.la 
 
 uninstall-hook:
-       rm -f $(DESTDIR)$(libdir)/libnss_gns.so.2 
-       rm -f $(DESTDIR)$(libdir)/libnss_gns4.so.2 
-       rm -f $(DESTDIR)$(libdir)/libnss_gns6.so.2 
+       $(SUDO_BINARY) rm -f $(nssdir)/libnss_gns.so.2 
$(nssdir)/libnss_gns4.so.2 $(nssdir)/libnss_gns6.so.2