mirror of
https://github.com/ntop/n2n.git
synced 2024-09-19 16:41:11 +02:00
Consolidate the config.mak settings
This commit is contained in:
parent
4e2b9e0a91
commit
37722ab8b6
6
Makefile
6
Makefile
|
@ -1,10 +1,4 @@
|
||||||
|
|
||||||
export CC
|
|
||||||
export AR
|
|
||||||
export CFLAGS
|
|
||||||
export LDFLAGS
|
|
||||||
export LDLIBS
|
|
||||||
|
|
||||||
include config.mak
|
include config.mak
|
||||||
|
|
||||||
#Ultrasparc64 users experiencing SIGBUS should try the following gcc options
|
#Ultrasparc64 users experiencing SIGBUS should try the following gcc options
|
||||||
|
|
|
@ -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@
|
N2N_VERSION=@N2N_VERSION@
|
||||||
|
|
||||||
CC=@CC@
|
CC=@CC@
|
||||||
AR=@AR@
|
AR=@AR@
|
||||||
CFLAGS=@CFLAGS@ -I./include
|
CFLAGS=@CFLAGS@ -I./include
|
||||||
LDFLAGS=@LDFLAGS@ -L.
|
LDFLAGS=@LDFLAGS@ -L.
|
||||||
LDLIBS_EXTRA+=@N2N_LIBS_EXTRA@
|
LDLIBS_EXTRA=@N2N_LIBS_EXTRA@
|
||||||
|
TOOLS_ADDITIONAL=@TOOLS_ADDITIONAL@
|
||||||
|
|
|
@ -154,6 +154,5 @@ AC_SUBST(N2N_LIBS_EXTRA)
|
||||||
AC_SUBST(TOOLS_ADDITIONAL)
|
AC_SUBST(TOOLS_ADDITIONAL)
|
||||||
AC_CONFIG_HEADERS(include/config.h)
|
AC_CONFIG_HEADERS(include/config.h)
|
||||||
AC_CONFIG_FILES(config.mak)
|
AC_CONFIG_FILES(config.mak)
|
||||||
AC_CONFIG_FILES(tools/config.mak)
|
|
||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
# This is not a standalone makefile, it must be called from the toplevel
|
# This is not a standalone makefile, it must be called from the toplevel
|
||||||
# makefile to inherit the correct environment
|
# makefile to inherit the correct environment
|
||||||
|
|
||||||
include config.mak
|
|
||||||
|
|
||||||
DEBUG?=-g3
|
DEBUG?=-g3
|
||||||
|
|
||||||
HEADERS=$(wildcard include/*.h)
|
HEADERS=$(wildcard include/*.h)
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
|
|
||||||
TOOLS_ADDITIONAL=@TOOLS_ADDITIONAL@
|
|
Loading…
Reference in New Issue
Block a user