folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up makefile to only build network support for simulators which can use it.

Browse source
This commit is contained in:
Mark Pizzolato 2011-11-10 10:17:55 -08:00
parent 3e10dfbd95
commit 5f1a22a7a5
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
makefile
View file

@ -37,8 +37,8 @@ ifeq ($(WIN32),)
OS_LDFLAGS += -lm OS_LDFLAGS += -lm
endif endif
ifeq (SunOS,$(shell uname)) ifeq (SunOS,$(shell uname))
OS_CCDEFS += -I/opt/sfw/include -DSIM_ASYNCH_IO -DUSE_READER_THREAD OS_CCDEFS += -I/opt/sfw/include
OS_LDFLAGS += -lsocket -lnsl -lrt -lm -lpthread -L/opt/sfw/lib -R/opt/sfw/lib OS_LDFLAGS += -lsocket -lnsl -L/opt/sfw/lib -R/opt/sfw/lib
endif endif
ifeq (cygwin,$(findstring cygwin,$(OSTYPE))) ifeq (cygwin,$(findstring cygwin,$(OSTYPE)))
OS_CCDEFS += -O2 OS_CCDEFS += -O2
@ -90,6 +90,7 @@ ifeq ($(WIN32),)
ifneq (binexists,$(shell if $(TEST) -e BIN; then echo binexists; fi)) ifneq (binexists,$(shell if $(TEST) -e BIN; then echo binexists; fi))
MKDIRBIN = if $(TEST) ! -e BIN; then mkdir BIN; fi MKDIRBIN = if $(TEST) ! -e BIN; then mkdir BIN; fi
endif endif
NETWORK_OPT = $(NETWORK_CCDEFS)
ifneq ($(USE_NETWORK),) ifneq ($(USE_NETWORK),)
# Assume built from tcpdump.org sources with default install target # Assume built from tcpdump.org sources with default install target
NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
@ -137,7 +138,7 @@ else
endif endif
CC = $(GCC) -std=c99 -U__STRICT_ANSI__ -g -I . $(NETWORK_CCDEFS) $(OS_CCDEFS) $(ROMS_OPT) CC = $(GCC) -std=c99 -U__STRICT_ANSI__ -g -I . $(OS_CCDEFS) $(ROMS_OPT)
LDFLAGS = $(OS_LDFLAGS) $(NETWORK_LDFLAGS) LDFLAGS = $(OS_LDFLAGS) $(NETWORK_LDFLAGS)
# #