Lines 1-15
Link Here
|
1 |
--- Makefile.orig 2007-09-06 11:51:24.000000000 +0300 |
1 |
--- Makefile.orig 2008-04-11 15:26:37.000000000 +0300 |
2 |
+++ Makefile 2007-09-08 19:16:08.000000000 +0300 |
2 |
+++ Makefile 2008-05-06 20:11:59.000000000 +0300 |
3 |
@@ -18,8 +18,6 @@ |
3 |
@@ -18,10 +18,6 @@ |
4 |
# From Hewlett Packard Company. |
4 |
# From Hewlett Packard Company. |
5 |
# |
5 |
# |
6 |
|
6 |
|
7 |
--include local.mk |
7 |
--include local.mk |
|
|
8 |
-SVN_VERSION=$(shell if test -d .svn ; then svnversion . | sed -e 's/^/svn/;' ; else echo unknown ; fi) |
9 |
-VERINFO=-DSVN_VERSION="\"$(SVN_VERSION)\"" |
8 |
- |
10 |
- |
9 |
# Output binary to be built |
11 |
# Output binary to be built |
10 |
OUTPUT=sipp |
12 |
OUTPUT=sipp |
11 |
|
13 |
|
12 |
@@ -69,7 +67,7 @@ |
14 |
@@ -71,7 +67,7 @@ |
13 |
CC_SunOS=gcc |
15 |
CC_SunOS=gcc |
14 |
CC_Cygwin=cc |
16 |
CC_Cygwin=cc |
15 |
CC_Darwin=cc |
17 |
CC_Darwin=cc |
Lines 18-24
Link Here
|
18 |
|
20 |
|
19 |
# C++ compiler mapping |
21 |
# C++ compiler mapping |
20 |
CPP_hpux=aCC |
22 |
CPP_hpux=aCC |
21 |
@@ -79,7 +77,7 @@ |
23 |
@@ -81,7 +77,7 @@ |
22 |
CPP_SunOS=g++ |
24 |
CPP_SunOS=g++ |
23 |
CPP_Cygwin=g++ |
25 |
CPP_Cygwin=g++ |
24 |
CPP_Darwin=g++ |
26 |
CPP_Darwin=g++ |
Lines 27-51
Link Here
|
27 |
|
29 |
|
28 |
#Model specific flags |
30 |
#Model specific flags |
29 |
MFLAGS_ia64=+DD64 |
31 |
MFLAGS_ia64=+DD64 |
30 |
@@ -102,7 +100,7 @@ |
32 |
@@ -104,7 +100,7 @@ |
31 |
CFLAGS_SunOS=-g -D__SUNOS |
33 |
CFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS |
32 |
CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int |
34 |
CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int |
33 |
CFLAGS_Darwin=-D__DARWIN |
35 |
CFLAGS_Darwin=-D__DARWIN |
34 |
-CFLAGS=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACFLAGS) |
36 |
-CFLAGS=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACFLAGS) |
35 |
+CFLAGS+=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACFLAGS) |
37 |
+CFLAGS+=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACFLAGS) |
36 |
|
38 |
|
37 |
#C++ Compiler Flags |
39 |
#C++ Compiler Flags |
38 |
CPPFLAGS_hpux=-AA -mt -D__HPUX +W829 |
40 |
CPPFLAGS_hpux=-AA -mt -D__HPUX -D_INCLUDE_LONGLONG -DNOMACROS +W829 |
39 |
@@ -112,7 +110,7 @@ |
41 |
@@ -114,7 +110,7 @@ |
40 |
CPPFLAGS_SunOS=-g -D__SUNOS |
42 |
CPPFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS |
41 |
CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int |
43 |
CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int |
42 |
CPPFLAGS_Darwin=-D__DARWIN |
44 |
CPPFLAGS_Darwin=-D__DARWIN |
43 |
-CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS) |
45 |
-CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS) |
44 |
+CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS) |
46 |
+CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS) |
45 |
|
47 |
|
46 |
#Linker mapping |
48 |
#Linker mapping |
47 |
CCLINK_hpux=aCC |
49 |
CCLINK_hpux=aCC |
48 |
@@ -122,7 +120,7 @@ |
50 |
@@ -124,7 +120,7 @@ |
49 |
CCLINK_SunOS=gcc |
51 |
CCLINK_SunOS=gcc |
50 |
CCLINK_Cygwin=g++ |
52 |
CCLINK_Cygwin=g++ |
51 |
CCLINK_Darwin=g++ |
53 |
CCLINK_Darwin=g++ |
Lines 54-60
Link Here
|
54 |
|
56 |
|
55 |
#Linker Flags |
57 |
#Linker Flags |
56 |
LFLAGS_hpux=-AA -mt |
58 |
LFLAGS_hpux=-AA -mt |
57 |
@@ -154,8 +152,6 @@ |
59 |
@@ -156,8 +152,6 @@ |
58 |
INCDIR_Darwin=-I. -I/usr/local/ssl/include |
60 |
INCDIR_Darwin=-I. -I/usr/local/ssl/include |
59 |
INCDIR=$(INCDIR_$(SYSTEM)) |
61 |
INCDIR=$(INCDIR_$(SYSTEM)) |
60 |
|
62 |
|