$OpenBSD: patch-makefile,v 1.9 2005/12/21 01:32:29 fgsch Exp $ --- makefile.orig Thu Apr 7 16:56:36 2005 +++ makefile Sat Jun 18 03:49:17 2005 @@ -3,28 +3,29 @@ # Note: -O2 is sometimes broken in GCC when setjump/longjump is being # used. Try -O2 only with released simulators. # -ifeq ($(WIN32),) +#ifeq ($(WIN32),) #Unix Environments -ifeq ($(OSTYPE),solaris) -OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE -else -OS_CCDEFS = -D_GNU_SOURCE -endif +#ifeq ($(OSTYPE),solaris) +#OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE +#else +OS_CCDEFS = -D_GNU_SOURCE ${CFLAGS} +#endif CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I . -ifeq ($(USE_NETWORK),) -else -NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a -endif -else +#ifeq ($(USE_NETWORK),) +#else +#NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a +NETWORK_OPT = -DUSE_NETWORK -DNEED_PCAP_SENDPACKET -lpcap +#endif +#else #Win32 Environments -LDFLAGS = -lm -lwsock32 -CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I. -EXE = .exe -ifeq ($(USE_NETWORK),) -else -NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket -endif -endif +#LDFLAGS = -lm -lwsock32 +#CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I. +#EXE = .exe +#ifeq ($(USE_NETWORK),) +#else +#NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket +#endif +#endif # @@ -253,11 +254,11 @@ ALL = ${BIN}pdp1${EXE} ${BIN}pdp4${EXE} all : ${ALL} clean : -ifeq ($(WIN32),) +#ifeq ($(WIN32),) ${RM} ${ALL} -else - if exist BIN\*.exe del /q BIN\*.exe -endif +#else +# if exist BIN\*.exe del /q BIN\*.exe +#endif # # Individual builds #