Consolidate the config.mak settings

1 year ago · 37722ab8b6
5 changed files with 9 additions and 14 deletions
--- a/6
+++ b/6
@ -1,10 +1,4 @@

-export CC
-export AR
-export CFLAGS
-export LDFLAGS
-export LDLIBS
-
 include config.mak

 #Ultrasparc64 users experiencing SIGBUS should try the following gcc options
--- a/config.mak.in
+++ b/config.mak.in
@ -1,9 +1,15 @@
+export N2N_VERSION
+export CC
+export AR
+export CFLAGS
+export LDFLAGS
+export LDLIBS_EXTRA
+export TOOLS_ADDITIONAL

-# NOTE: these are needed by the configure.in inside the packages folder
 N2N_VERSION=@N2N_VERSION@
-
 CC=@CC@
 AR=@AR@
 CFLAGS=@CFLAGS@ -I./include
 LDFLAGS=@LDFLAGS@ -L.
-LDLIBS_EXTRA+=@N2N_LIBS_EXTRA@
+LDLIBS_EXTRA=@N2N_LIBS_EXTRA@
+TOOLS_ADDITIONAL=@TOOLS_ADDITIONAL@
--- a/configure.ac
+++ b/configure.ac
@ -154,6 +154,5 @@ AC_SUBST(N2N_LIBS_EXTRA)
 AC_SUBST(TOOLS_ADDITIONAL)
 AC_CONFIG_HEADERS(include/config.h)
 AC_CONFIG_FILES(config.mak)
-AC_CONFIG_FILES(tools/config.mak)

 AC_OUTPUT
--- a/tools/Makefile
+++ b/tools/Makefile
@ -2,8 +2,6 @@
 # This is not a standalone makefile, it must be called from the toplevel
 # makefile to inherit the correct environment

-include config.mak
-
 DEBUG?=-g3

 HEADERS=$(wildcard include/*.h)
--- a/tools/config.mak.in
+++ b/tools/config.mak.in
@ -1,2 +0,0 @@
-
-TOOLS_ADDITIONAL=@TOOLS_ADDITIONAL@