$NetBSD$

--- Makefile.orig	2011-12-20 16:06:37.000000000 +0100
+++ Makefile	2011-12-20 16:15:27.000000000 +0100
@@ -30,15 +30,6 @@
      actions.o variables.o infile.o deadcall.o task.o socketowner.o listener.o \
      opentask.o reporttask.o watchdog.o
 
-# Libraries directories
-LIBDIR_linux=
-LIBDIR_FreeBSD=
-LIBDIR_hpux=
-LIBDIR_tru64=
-LIBDIR_SunOS=
-LIBDIR_Cygwin=
-LIBDIR_Darwin=
-
 # Archive file created in your home directory when building the archive target
 # ARCHIVE= $(HOME)/$(OUTPUT).tgz
 ARCHIVE= $(OUTPUT).tgz
@@ -50,102 +41,9 @@
 
 ###################################################################
 # Generic Rules
-
-#OSNAME=`uname`
-#MODELNAME=`uname -m`
-
-# SYSTEM nickname
-SYSTEM_HP-UX=hpux
-SYSTEM_Linux=linux
-SYSTEM_FreeBSD=freebsd
-SYSTEM_OSF1=tru64
-SYSTEM_SunOS=SunOS
-SYSTEM_CYGWIN=Cygwin
-SYSTEM_Darwin=Darwin
-SYSTEM=$(SYSTEM_$(OSNAME))
-
-# C compiler
-CC_hpux=aCC
-CC_linux=gcc  
-CC_freebsd=cc  
-CC_tru64=cc  
-CC_SunOS=gcc
-CC_Cygwin=cc  
-CC_Darwin=cc  
-CC=$(CC_$(SYSTEM))
-
-# C++ compiler mapping
-CPP_hpux=aCC  
-CPP_linux=g++  
-CPP_freebsd=g++  
-CPP_tru64=cxx  
-CPP_SunOS=g++
-CPP_Cygwin=g++  
-CPP_Darwin=g++  
-CPP=$(CPP_$(SYSTEM))
-
-#Model specific flags
-MFLAGS_ia64=+DD64
-MFLAGS_9000/800=+DAportable
-MFLAGS_9000/785=+DAportable
-MFLAGS_i686=
-MFLAGS_i586=
-MFLAGS_i486=
-MFLAGS_i386=
-MFLAGS_ppc=
-MFLAGS=$(MFLAGS_$(MODELNAME))
-
-#C Compiler Flags
-# supress warning #829 (Implicit conversion of string literal to
-#'char *' is deprecated) since this is both common and harmless
-CFLAGS_hpux=-D__HPUX -DPROTOTYPES +W829
-CFLAGS_linux=-D__LINUX -pthread 
-CFLAGS_freebsd=-D__LINUX -pthread
-CFLAGS_tru64=-D__OSF1 -pthread
-CFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
-CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
-CFLAGS_Darwin=-D__DARWIN
-CFLAGS=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
-
-#C++ Compiler Flags
-CPPFLAGS_hpux=-AA -mt -D__HPUX -D_INCLUDE_LONGLONG -DNOMACROS +W829  
-CPPFLAGS_linux=-D__LINUX -pthread 
-CPPFLAGS_freebsd=-D__LINUX -pthread
-CPPFLAGS_tru64=-D__OSF1 -pthread
-CPPFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
-CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
-CPPFLAGS_Darwin=-D__DARWIN
-CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
-
-#Linker mapping
-CCLINK_hpux=aCC
-CCLINK_linux=gcc
-CCLINK_freebsd=g++
-CCLINK_tru64=cxx
-CCLINK_SunOS=gcc
-CCLINK_Cygwin=g++
-CCLINK_Darwin=g++
-CCLINK=$(CCLINK_$(SYSTEM))
-
-#Linker Flags
-LFLAGS_hpux=-AA -mt
-LFLAGS_linux=
-LFLAGS_freebsd=
-LFLAGS_tru64=
-LFLAGS_SunOS=-mt ${DEBUG_FLAGS}
-LFLAGS_Cygwin=
-LFLAGS_Darwin=
-LFLAGS=$(LFLAGS_$(SYSTEM)) $(EXTRALFLAGS)
-
-#Link Libraries
-LIBS_linux= -ldl -lpthread -lncurses -lstdc++ -lm -L /usr/local/lib -L /usr/lib -L /usr/lib64
-LIBS_hpux= -lcurses -lpthread -L /opt/openssl/lib -L /usr/local/lib
-LIBS_tru64= -lcurses -lpthread
-LIBS_freebsd= -lcurses -pthread -L /usr/local/lib
-LIBS_SunOS= -lcurses -lpthread -lnsl -lsocket -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm -ldl -L /usr/local/ssl/lib/
-LIBS_Cygwin= -lcurses -lpthread -lstdc++ -L /usr/lib/WpdPack/Lib
-LIBS_Darwin= -lcurses
-LIBS=$(LIBS_$(SYSTEM)) $(EXTRALIBS)
+LDFLAGS+=	${PTHREAD_LDFLAGS} ${DL_FLAGS}
+LIBS.SunOS=	-lnsl -lsocket
+LIBS+=		-lncurses ${PTHREAD_LIBS} ${LIBS.${OPSYS}} ${DL_LIBS}
 
 # Include directories
 INCDIR_linux=-I. -I/usr/include/openssl
@@ -160,8 +58,7 @@
 -include local.mk
 
 # Building without TLS and authentication (no openssl pre-requisite)
-all:
-	$(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` $(OUTPUT)
+all: ${OUTPUT}
 
 # Building with TLS and authentication
 ossl:
@@ -187,7 +84,7 @@
 	$(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` OBJ_TLS="auth.o sslinit.o sslthreadsafe.o  milenage.o rijndael.o" TLS_LIBS="-lssl -lcrypto" TLS="-D_USE_OPENSSL -DOPENSSL_NO_KRB5"  OBJ_PCAPPLAY="send_packets.o prepare_pcap.o" PCAPPLAY_LIBS="-lwpcap" PCAPPLAY="-DPCAPPLAY" $(OUTPUT)
 
 $(OUTPUT): $(OBJ_TLS) $(OBJ_PCAPPLAY) $(OBJ)
-	$(CCLINK) $(LFLAGS) $(MFLAGS) $(LIBDIR_$(SYSTEM)) \
+	$(CXX) $(LDFLAGS) \
 	$(DEBUG_FLAGS) -o $@ $(OBJ_TLS) $(OBJ_PCAPPLAY) $(OBJ) $(LIBS) $(TLS_LIBS) $(PCAPPLAY_LIBS) $(EXTRAENDLIBS)
 
 debug:
@@ -221,14 +118,14 @@
 *.o: *.h *.hpp
 
 .C.o:
-	$(CPP) $(CPPFLAGS) $(MFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o $*.o $<
+	$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o $*.o $<
 
 .cpp.o:
-	$(CPP) $(CPPFLAGS) $(MFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o $*.o $<
+	$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o $*.o $<
 
 .c.o:
-	$(CC) $(CFLAGS) $(MFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o $*.o $<
+	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o $*.o $<
 
 fortune.so: fortune.cpp
-	g++ -fPIC $(CPPFLAGS) $(MFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o fortune.o $<
-	gcc -shared -Wl,-soname,fortune.so -o $@ fortune.o
+	$(CXX) -fPIC $(CXXFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o fortune.o $<
+	$(CC) -shared -Wl,-soname,fortune.so -o $@ fortune.o
