From 37722ab8b61ef6c170e361dff31ce4c6506af96f Mon Sep 17 00:00:00 2001 From: Hamish Coleman Date: Sun, 30 Apr 2023 19:00:04 -0500 Subject: [PATCH] Consolidate the config.mak settings --- Makefile | 6 ------ config.mak.in | 12 +++++++++--- configure.ac | 1 - tools/Makefile | 2 -- tools/config.mak.in | 2 -- 5 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 tools/config.mak.in diff --git a/Makefile b/Makefile index 1bb818f..08633dc 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/config.mak.in b/config.mak.in index 692a5aa..6c1345f 100644 --- 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@ diff --git a/configure.ac b/configure.ac index fb37696..a15a6d6 100644 --- 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 diff --git a/tools/Makefile b/tools/Makefile index 683311e..74e1fad 100644 --- 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) diff --git a/tools/config.mak.in b/tools/config.mak.in deleted file mode 100644 index d396110..0000000 --- a/tools/config.mak.in +++ /dev/null @@ -1,2 +0,0 @@ - -TOOLS_ADDITIONAL=@TOOLS_ADDITIONAL@