From 3876564302e541a09cebd6dc6eb8a228cfeeddde Mon Sep 17 00:00:00 2001
From:  <totakura@in.tum.de>
Date: Fri, 4 Jan 2013 12:13:59 +0000
Subject: follow autoconf naming convention for variables. See:
 https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Preset-Output-Variables.html#Preset-Output-Variables

---
 src/ext/Makefile.am | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/ext/Makefile.am b/src/ext/Makefile.am
index eb91918..7e2257d 100644
--- a/src/ext/Makefile.am
+++ b/src/ext/Makefile.am
@@ -2,8 +2,17 @@ SUBDIRS = .
 
 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
 
@@ -12,7 +21,7 @@ libgnunetext_la_SOURCES = \
 libgnunetext_la_LIBADD = \
   -lgnunetutil
 libgnunetext_la_LDFLAGS = \
-  $(GNUNET_LIBS)  $(WINFLAGS) \
+  $(GNUNET_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
 
 
@@ -24,7 +33,7 @@ gnunet_service_ext_LDADD = \
   -lgnunetutil -lgnunetcore\
   $(INTLLIBS) 
 gnunet_service_ext_LDFLAGS = \
-  $(GNUNET_LIBS)  $(WINFLAGS) -export-dynamic 
+  $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic 
 
 gnunet_ext_SOURCES = \
   gnunet-ext.c
@@ -32,7 +41,7 @@ gnunet_ext_LDADD = \
   -lgnunetutil \
   $(INTLLIBS) 
 gnunet_ext_LDFLAGS = \
- $(GNUNET_LIBS) $(WINFLAGS) -export-dynamic 
+ $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic 
 
 
 check_PROGRAMS = \
@@ -46,4 +55,4 @@ test_ext_api_LDADD = \
   $(top_builddir)/src/ext/libgnunetext.la \
   -lgnunetutil
 test_ext_api_LDFLAGS = \
- $(GNUNET_LIBS)  $(WINFLAGS) -export-dynamic 
\ No newline at end of file
+ $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic 
\ No newline at end of file
-- 
cgit v1.2.3