Applied Vasan Sundar's patch:
<<<<<<<<<<<<<<<<<<<<
This fixes 2 problems we noticed with setting CFLAGS in the makefiles.
1. export CFLAGS from the top-level makefile so that it is available for
the sub-makes. (We somehow missed this in our earlier patch in Jan. This
is useful for cross-compilation)
2. In the lower-level makefiles, append to CFLAGS ( +=) instead of
setting it.
>>>>>>>>>>>>>>>>>>>>
diff --git a/Makefile b/Makefile
index 0e6dff1..0a1c9cd 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@
# in the commandline and in the Makefiles use a dummy variable like in
# CFLAGS
-CFLAGS = -Wall $(CROSS_CFLAGS)
+export CFLAGS = -Wall $(CROSS_CFLAGS)
all: libltp.a
@$(MAKE) -C pan $@
diff --git a/pan/Makefile b/pan/Makefile
index db8bc8a..ee845a6 100644
--- a/pan/Makefile
+++ b/pan/Makefile
@@ -1,7 +1,7 @@
LDFLAGS = -lm
LFLAGS = -l
-CFLAGS = -Wall
+CFLAGS += -Wall
all: pan bump scanner
diff --git a/testcases/kernel/io/direct_io/Makefile b/testcases/kernel/io/direct_io/Makefile
index f8921f8..0d85a84 100644
--- a/testcases/kernel/io/direct_io/Makefile
+++ b/testcases/kernel/io/direct_io/Makefile
@@ -6,7 +6,7 @@
#
-CFLAGS= -O -DSHARED_OFILE -D_GNU_SOURCE
+CFLAGS+= -O -DSHARED_OFILE -D_GNU_SOURCE
SRCS= diotest1.c diotest2.c diotest3.c diotest4.c diotest5.c \
diotest6.c
diff --git a/testcases/kernel/io/disktest/Makefile b/testcases/kernel/io/disktest/Makefile
index f400ebc..06fd384 100644
--- a/testcases/kernel/io/disktest/Makefile
+++ b/testcases/kernel/io/disktest/Makefile
@@ -23,8 +23,20 @@
# Project Website: TBD
#
#
-# $Id: Makefile,v 1.2 2002/05/28 14:45:38 plars Exp $
+# $Id: Makefile,v 1.3 2003/03/13 15:34:18 robbiew Exp $
# $Log: Makefile,v $
+# Revision 1.3 2003/03/13 15:34:18 robbiew
+# Applied Vasan Sundar's patch:
+# <<<<<<<<<<<<<<<<<<<<
+# This fixes 2 problems we noticed with setting CFLAGS in the makefiles.
+#
+# 1. export CFLAGS from the top-level makefile so that it is available for
+# the sub-makes. (We somehow missed this in our earlier patch in Jan. This
+# is useful for cross-compilation)
+# 2. In the lower-level makefiles, append to CFLAGS ( +=) instead of
+# setting it.
+# >>>>>>>>>>>>>>>>>>>>
+#
# Revision 1.2 2002/05/28 14:45:38 plars
# MIPS fixes from Johannes Stezenbach:
# ltp-20020507 / current CVS does not compile on MIPS, because
@@ -72,7 +84,7 @@
# Split usage out. Split header out. Added usage text.
# Made signal handler one function. code cleanup.
#
-CFLAGS= -Wall -O -g -D"_LARGEFILE64_SOURCE" -D"_FILE_OFFSET_BITS=64"
+CFLAGS+= -Wall -O -g -D"_LARGEFILE64_SOURCE" -D"_FILE_OFFSET_BITS=64"
#CC=gcc
all: disktest
diff --git a/testcases/network/ipv6/tools/netpipe-ipv6/Makefile b/testcases/network/ipv6/tools/netpipe-ipv6/Makefile
index 4e57853..e6134f2 100644
--- a/testcases/network/ipv6/tools/netpipe-ipv6/Makefile
+++ b/testcases/network/ipv6/tools/netpipe-ipv6/Makefile
@@ -1,6 +1,6 @@
#
# Makefile for NetPIPE
-# $Id: Makefile,v 1.1 2002/03/18 21:39:34 robbiew Exp $
+# $Id: Makefile,v 1.2 2003/03/13 15:34:19 robbiew Exp $
#
# Default C compiler: must be an ANSI C compiler
@@ -13,7 +13,7 @@
TARGETS = NPtcp
# If you have TCP, MPI and PVM
#TARGETS = NPtcp NPmpi NPpvm
-CFLAGS = -O
+CFLAGS += -O
# Adjust these for MPI (only used if you have MPI)
MPI_HOME = /home/mpich
MPI_ARCH = IRIX
diff --git a/testcases/network/sctp/bind/Makefile b/testcases/network/sctp/bind/Makefile
index 3a6f833..0d7747c 100644
--- a/testcases/network/sctp/bind/Makefile
+++ b/testcases/network/sctp/bind/Makefile
@@ -21,7 +21,7 @@
###########################################################################
CC=gcc
-CFLAGS=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
+CFLAGS+=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
-DCONFIG_IP_SCTP=1 \
-DUSE_CRC32C=1 \
-DCONFIG_IP_SCTP_ADDIP=0 -DSCTP_DEBUG=1
diff --git a/testcases/network/sctp/close/Makefile b/testcases/network/sctp/close/Makefile
index f7b454e..bfdf977 100644
--- a/testcases/network/sctp/close/Makefile
+++ b/testcases/network/sctp/close/Makefile
@@ -25,7 +25,7 @@
SCTP_LIB_DIR=${LKSCTP_DIR}/test
CC=gcc
-CFLAGS=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
+CFLAGS+=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
-DCONFIG_IP_SCTP=1 \
-DUSE_CRC32C=1 \
-DCONFIG_IP_SCTP_ADDIP=0 -DSCTP_DEBUG=1
diff --git a/testcases/network/sctp/connect/Makefile b/testcases/network/sctp/connect/Makefile
index c4ce337..10f888c 100644
--- a/testcases/network/sctp/connect/Makefile
+++ b/testcases/network/sctp/connect/Makefile
@@ -25,7 +25,7 @@
SCTP_LIB_DIR=${LKSCTP_DIR}/test
CC=gcc
-CFLAGS=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
+CFLAGS+=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
-DCONFIG_IP_SCTP=1 \
-DUSE_CRC32C=1 \
-DCONFIG_IP_SCTP_ADDIP=0 -DSCTP_DEBUG=1
diff --git a/testcases/network/sctp/listen/Makefile b/testcases/network/sctp/listen/Makefile
index a385b94..29e6fce 100644
--- a/testcases/network/sctp/listen/Makefile
+++ b/testcases/network/sctp/listen/Makefile
@@ -25,7 +25,7 @@
SCTP_LIB_DIR=${LKSCTP_DIR}/test
CC=gcc
-CFLAGS=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
+CFLAGS+=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
-DCONFIG_IP_SCTP=1 \
-DUSE_CRC32C=1 \
-DCONFIG_IP_SCTP_ADDIP=0 -DSCTP_DEBUG=1
diff --git a/testcases/network/sctp/read/Makefile b/testcases/network/sctp/read/Makefile
index 94a6f24..9536192 100644
--- a/testcases/network/sctp/read/Makefile
+++ b/testcases/network/sctp/read/Makefile
@@ -23,7 +23,7 @@
LINUX=/usr/src/lksctp-2.4.18/lksctp/linux_sctp
CC=gcc
-CFLAGS=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
+CFLAGS+=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
-DCONFIG_IP_SCTP=1 \
-DUSE_CRC32C=1 \
-DCONFIG_IP_SCTP_ADDIP=0 -DSCTP_DEBUG=1
diff --git a/testcases/network/sctp/recv/Makefile b/testcases/network/sctp/recv/Makefile
index c4ce337..10f888c 100644
--- a/testcases/network/sctp/recv/Makefile
+++ b/testcases/network/sctp/recv/Makefile
@@ -25,7 +25,7 @@
SCTP_LIB_DIR=${LKSCTP_DIR}/test
CC=gcc
-CFLAGS=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
+CFLAGS+=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
-DCONFIG_IP_SCTP=1 \
-DUSE_CRC32C=1 \
-DCONFIG_IP_SCTP_ADDIP=0 -DSCTP_DEBUG=1
diff --git a/testcases/network/sctp/recvfrom/Makefile b/testcases/network/sctp/recvfrom/Makefile
index a385b94..29e6fce 100644
--- a/testcases/network/sctp/recvfrom/Makefile
+++ b/testcases/network/sctp/recvfrom/Makefile
@@ -25,7 +25,7 @@
SCTP_LIB_DIR=${LKSCTP_DIR}/test
CC=gcc
-CFLAGS=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
+CFLAGS+=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
-DCONFIG_IP_SCTP=1 \
-DUSE_CRC32C=1 \
-DCONFIG_IP_SCTP_ADDIP=0 -DSCTP_DEBUG=1
diff --git a/testcases/network/sctp/send/Makefile b/testcases/network/sctp/send/Makefile
index a385b94..29e6fce 100644
--- a/testcases/network/sctp/send/Makefile
+++ b/testcases/network/sctp/send/Makefile
@@ -25,7 +25,7 @@
SCTP_LIB_DIR=${LKSCTP_DIR}/test
CC=gcc
-CFLAGS=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
+CFLAGS+=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
-DCONFIG_IP_SCTP=1 \
-DUSE_CRC32C=1 \
-DCONFIG_IP_SCTP_ADDIP=0 -DSCTP_DEBUG=1
diff --git a/testcases/network/sctp/sendto/Makefile b/testcases/network/sctp/sendto/Makefile
index a385b94..29e6fce 100644
--- a/testcases/network/sctp/sendto/Makefile
+++ b/testcases/network/sctp/sendto/Makefile
@@ -25,7 +25,7 @@
SCTP_LIB_DIR=${LKSCTP_DIR}/test
CC=gcc
-CFLAGS=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
+CFLAGS+=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
-DCONFIG_IP_SCTP=1 \
-DUSE_CRC32C=1 \
-DCONFIG_IP_SCTP_ADDIP=0 -DSCTP_DEBUG=1
diff --git a/testcases/network/sctp/socket/Makefile b/testcases/network/sctp/socket/Makefile
index c4ce337..10f888c 100644
--- a/testcases/network/sctp/socket/Makefile
+++ b/testcases/network/sctp/socket/Makefile
@@ -25,7 +25,7 @@
SCTP_LIB_DIR=${LKSCTP_DIR}/test
CC=gcc
-CFLAGS=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
+CFLAGS+=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
-DCONFIG_IP_SCTP=1 \
-DUSE_CRC32C=1 \
-DCONFIG_IP_SCTP_ADDIP=0 -DSCTP_DEBUG=1
diff --git a/testcases/network/sctp/write/Makefile b/testcases/network/sctp/write/Makefile
index 94a6f24..9536192 100644
--- a/testcases/network/sctp/write/Makefile
+++ b/testcases/network/sctp/write/Makefile
@@ -23,7 +23,7 @@
LINUX=/usr/src/lksctp-2.4.18/lksctp/linux_sctp
CC=gcc
-CFLAGS=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
+CFLAGS+=-g ${INCLUDES} ${WARNINGS} -DTEST_FRAME=1 \
-DCONFIG_IP_SCTP=1 \
-DUSE_CRC32C=1 \
-DCONFIG_IP_SCTP_ADDIP=0 -DSCTP_DEBUG=1
diff --git a/tools/netpipe-2.4/Makefile b/tools/netpipe-2.4/Makefile
index 9e926ca..5aa7704 100644
--- a/tools/netpipe-2.4/Makefile
+++ b/tools/netpipe-2.4/Makefile
@@ -1,6 +1,6 @@
#
# Makefile for NetPIPE
-# $Id: Makefile,v 1.6 2003/03/04 21:43:31 robbiew Exp $
+# $Id: Makefile,v 1.7 2003/03/13 15:34:31 robbiew Exp $
#
# Default C compiler: must be an ANSI C compiler
@@ -13,7 +13,7 @@
TARGETS = NPtcp
# If you have TCP, MPI and PVM
#TARGETS = NPtcp NPmpi NPpvm
-CFLAGS = -O
+CFLAGS += -O
# Adjust these for MPI (only used if you have MPI)
MPI_HOME = /home/mpich
MPI_ARCH = IRIX