[GNUnet-SVN] r25694 - in gnunet-update: . src/ext src/tests

[gnunet]

Author: harsha
Date: 2013-01-04 13:31:54 +0100 (Fri, 04 Jan 2013)
New Revision: 25694

Modified:
   gnunet-update/configure.ac
   gnunet-update/src/ext/Makefile.am
   gnunet-update/src/tests/Makefile.am
Log:
- following autoconf naming convention

Modified: gnunet-update/configure.ac
===================================================================
--- gnunet-update/configure.ac  2013-01-04 12:19:51 UTC (rev 25693)
+++ gnunet-update/configure.ac  2013-01-04 12:31:54 UTC (rev 25694)
@@ -122,12 +122,10 @@
 # test for GNUnet core
 gnunet=0
 lookin=${prefix}
-backup_LIBS="$LIBS"    
-backup_CFLAGS="$CFLAGS "
+backup_LDFLAGS="$LDFLAGS"      
 backup_CPPFLAGS="$CPPFLAGS"
-GNUNET_CFLAGS=""
+GNUNET_LDFLAGS=""
 GNUNET_CPPFLAGS=""
-GNUNET_LIBS=""
 AC_MSG_CHECKING(for GNUnet core)
 AC_ARG_WITH(gnunet,
    [  --with-gnunet=PFX       Base of GNUnet installation],
@@ -153,11 +151,9 @@
 if test "x$gnunet" == "x0" -a ! "x$lookin" == "x"
 then
   AC_MSG_CHECKING(for GNUnet util library in $lookin)
-  GNUNET_LIBS="-L${lookin}/lib"
-  GNUNET_CFLAGS="-I${lookin}/include"
+  GNUNET_LDFLAGS="-L${lookin}/lib"
   GNUNET_CPPFLAGS="-I${lookin}/include"
-  LIBS="$GNUNET_LIBS $backup_LIBS"
-  CFLAGS="$GNUNET_CFLAGS $backup_CFLAGS"
+  LDFLAGS="$GNUNET_LDFLAGS $backup_LDFLAGS"
   CPPFLAGS="$GNUNET_CPPFLAGS $backup_CPPFLAGS"
   AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h],
     AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
@@ -174,10 +170,9 @@
   AC_MSG_ERROR([gnunet-update requires GNUnet])
 fi
 
-AC_SUBST(GNUNET_CFLAGS)
-AC_SUBST(GNUNET_LIBS)
-LIBS="$backup_LIBS"
-CFLAGS="$backup_CFLAGS"
+AC_SUBST(GNUNET_CPPFLAGS)
+AC_SUBST(GNUNET_LDFLAGS)
+LDFLAGS="$backup_LDFLAGS"
 CPPFLAGS="$backup_CPPFLAGS"
 
 AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing 
read-only architecture-independent data])


Property changes on: gnunet-update/configure.ac
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1 ##
+/gnunet-ext/configure.ac:25689
\ No newline at end of property
Modified: gnunet-update/src/ext/Makefile.am
===================================================================
--- gnunet-update/src/ext/Makefile.am   2013-01-04 12:19:51 UTC (rev 25693)
+++ gnunet-update/src/ext/Makefile.am   2013-01-04 12:31:54 UTC (rev 25694)
@@ -2,9 +2,19 @@
 
 INCLUDES = \
   -I$(top_srcdir)/src/include \
-  -I$(top_srcdir) \
-  @GNUNET_CFLAGS@ 
+  -I$(top_srcdir)
 
+AM_CPPFLAGS = \
+  $(GNUNET_CPPFLAGS)
+
+# Set this variable if you are using GNUNET libraries for all programs and
+# libraries. You don't then need to target-specific _LDFLAGS with 
GNUNET_LDFLAGS
+
+AM_LDFLAGS = \
+  $(GNUNET_LDFLAGS) \
+  $(WINFLAGS) \
+  -export-dynamic
+
 lib_LTLIBRARIES = libgnunetext.la
 
 libgnunetext_la_SOURCES = \
@@ -12,7 +22,6 @@
 libgnunetext_la_LIBADD = \
   -lgnunetutil
 libgnunetext_la_LDFLAGS = \
-  $(GNUNET_LIBS)  $(WINFLAGS) \
   -version-info 0:0:0
 
 
@@ -23,18 +32,13 @@
 gnunet_service_ext_LDADD = \
   -lgnunetutil -lgnunetcore\
   $(INTLLIBS) 
-gnunet_service_ext_LDFLAGS = \
-  $(GNUNET_LIBS)  $(WINFLAGS) -export-dynamic 
 
 gnunet_ext_SOURCES = \
   gnunet-ext.c
 gnunet_ext_LDADD = \
   -lgnunetutil \
   $(INTLLIBS) 
-gnunet_ext_LDFLAGS = \
- $(GNUNET_LIBS) $(WINFLAGS) -export-dynamic 
 
-
 check_PROGRAMS = \
  test_ext_api \
  test_file_hash
@@ -47,10 +51,8 @@
 test_ext_api_LDADD = \
   $(top_builddir)/src/ext/libgnunetext.la \
   -lgnunetutil
-test_ext_api_LDFLAGS = \
- $(GNUNET_LIBS)  $(WINFLAGS) -export-dynamic
 
 test_file_hash_SOURCES = \
   test_file_hash.c
 test_file_hash_LDADD = \
-  -lgnunetutil
\ No newline at end of file
+  -lgnunetutil


Property changes on: gnunet-update/src/ext/Makefile.am
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1 ##
+/gnunet-ext/src/ext/Makefile.am:25689
\ No newline at end of property
Modified: gnunet-update/src/tests/Makefile.am
===================================================================
--- gnunet-update/src/tests/Makefile.am 2013-01-04 12:19:51 UTC (rev 25693)
+++ gnunet-update/src/tests/Makefile.am 2013-01-04 12:31:54 UTC (rev 25694)
@@ -1,6 +1,10 @@
-AM_CFLAGS = $(GNUNET_CFLAGS)
 AM_CPPFLAGS = $(GNUNET_CPPFLAGS)
 
+AM_LDFLAGS = \
+  $(GNUNET_LDFLAGS) \
+  $(WINFLAGS) \
+  -export-dynamic
+
 do_subst = sed -e 's,address@hidden@],$(pkgpythondir),g' \
        -e 's,address@hidden@],$(prefix),g' \
        -e 's,address@hidden@],$(srcdir),g'