c071c00e67
PR: ports/123470 Submitted by: Artem Naluzhnyy <tut@nhamon.com.ua> Approved by: tabthorpe (mentor)
67 lines
1.8 KiB
Text
67 lines
1.8 KiB
Text
--- Makefile.orig 2008-04-11 15:26:37.000000000 +0300
|
|
+++ Makefile 2008-05-06 20:11:59.000000000 +0300
|
|
@@ -18,10 +18,6 @@
|
|
# From Hewlett Packard Company.
|
|
#
|
|
|
|
--include local.mk
|
|
-SVN_VERSION=$(shell if test -d .svn ; then svnversion . | sed -e 's/^/svn/;' ; else echo unknown ; fi)
|
|
-VERINFO=-DSVN_VERSION="\"$(SVN_VERSION)\""
|
|
-
|
|
# Output binary to be built
|
|
OUTPUT=sipp
|
|
|
|
@@ -71,7 +67,7 @@
|
|
CC_SunOS=gcc
|
|
CC_Cygwin=cc
|
|
CC_Darwin=cc
|
|
-CC=$(CC_$(SYSTEM))
|
|
+CC?=$(CC_$(SYSTEM))
|
|
|
|
# C++ compiler mapping
|
|
CPP_hpux=aCC
|
|
@@ -81,7 +77,7 @@
|
|
CPP_SunOS=g++
|
|
CPP_Cygwin=g++
|
|
CPP_Darwin=g++
|
|
-CPP=$(CPP_$(SYSTEM))
|
|
+CPP?=$(CPP_$(SYSTEM))
|
|
|
|
#Model specific flags
|
|
MFLAGS_ia64=+DD64
|
|
@@ -104,7 +100,7 @@
|
|
CFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
|
|
CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
|
|
CFLAGS_Darwin=-D__DARWIN
|
|
-CFLAGS=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
|
|
+CFLAGS+=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
|
|
|
|
#C++ Compiler Flags
|
|
CPPFLAGS_hpux=-AA -mt -D__HPUX -D_INCLUDE_LONGLONG -DNOMACROS +W829
|
|
@@ -114,7 +110,7 @@
|
|
CPPFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
|
|
CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
|
|
CPPFLAGS_Darwin=-D__DARWIN
|
|
-CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
|
|
+CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
|
|
|
|
#Linker mapping
|
|
CCLINK_hpux=aCC
|
|
@@ -124,7 +120,7 @@
|
|
CCLINK_SunOS=gcc
|
|
CCLINK_Cygwin=g++
|
|
CCLINK_Darwin=g++
|
|
-CCLINK=$(CCLINK_$(SYSTEM))
|
|
+CCLINK?=$(CCLINK_$(SYSTEM))
|
|
|
|
#Linker Flags
|
|
LFLAGS_hpux=-AA -mt
|
|
@@ -156,8 +152,6 @@
|
|
INCDIR_Darwin=-I. -I/usr/local/ssl/include
|
|
INCDIR=$(INCDIR_$(SYSTEM))
|
|
|
|
--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)
|