enoch/n2n
1
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-09-19 16:41:11 +02:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Consolidate the config.mak settings

Browse Source
This commit is contained in:
Hamish Coleman 2023-04-30 19:00:04 -05:00
parent 4e2b9e0a91
commit 37722ab8b6
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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

12
config.mak.in
View File

@ -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@

1
configure.ac
View File

@ -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

2
tools/Makefile
View File

@ -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)

2
tools/config.mak.in
View File

@ -1,2 +0,0 @@
TOOLS_ADDITIONAL=@TOOLS_ADDITIONAL@