aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMike Holmes <mike.holmes@linaro.org>2014-02-19 18:14:58 -0500
committerMaxim Uvarov <maxim.uvarov@linaro.org>2014-02-24 12:47:44 +0400
commitf5829c4a78f561422bbc831518d53f621490b4cb (patch)
tree603855c0b711c18de0bf1765e3b96babf61e1d07 /test
parentab883023161072cf1d714337358926daeddd8d43 (diff)
Makefiles: Allow CFLAGS to overide the build
Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.inc4
-rw-r--r--test/api_test/Makefile6
-rw-r--r--test/example/Makefile2
-rw-r--r--test/packet/Makefile4
-rw-r--r--test/packet_netmap/Makefile5
5 files changed, 10 insertions, 11 deletions
diff --git a/test/Makefile.inc b/test/Makefile.inc
index 72bbebd8c..63feecf3b 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -5,8 +5,8 @@
ODP_TEST_ROOT = $(ODP_ROOT)/test
-CFLAGS += -I$(DESTDIR)/include
+EXTRA_CFLAGS += -I$(DESTDIR)/include
LIB = -L$(DESTDIR)/lib -lodp
LDFLAGS += -lrt
-LDFLAGS += $(EXTRA_CFLAGS)
+#LDFLAGS += $(CFLAGS)
diff --git a/test/api_test/Makefile b/test/api_test/Makefile
index 15c18f46b..741fbe432 100644
--- a/test/api_test/Makefile
+++ b/test/api_test/Makefile
@@ -12,12 +12,12 @@ ODP_ATOMIC = odp_atomic
ODP_SHM = odp_shm
ODP_RING = odp_ring
-CFLAGS += -I$(ODP_ROOT)/platform/linux-generic/include
+EXTRA_CFLAGS += -I$(ODP_ROOT)/platform/linux-generic/include
include ../Makefile.inc
include $(ODP_ROOT)/Makefile.inc
-CFLAGS += -I$(ODP_TEST_ROOT)/api_test
+EXTRA_CFLAGS += -I$(ODP_TEST_ROOT)/api_test
ATOMIC_OBJS =
ATOMIC_OBJS += $(OBJ_DIR)/odp_common.o
@@ -52,7 +52,7 @@ $(OBJ_DIR): $(DESTDIR)/lib/libodp.a
#
$(OBJ_DIR)/%.o: %.c
$(ECHO) Compiling $<
- $(CC) -c -MD $(CFLAGS) -o $@ $<
+ $(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
#
# Link rule
diff --git a/test/example/Makefile b/test/example/Makefile
index d43e780a5..80649770f 100644
--- a/test/example/Makefile
+++ b/test/example/Makefile
@@ -30,7 +30,7 @@ $(OBJ_DIR): $(DESTDIR)/lib/libodp.a
#
$(OBJ_DIR)/%.o: %.c
$(ECHO) Compiling $<
- $(CC) -c -MD $(CFLAGS) -o $@ $<
+ $(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
#
# Link rule
diff --git a/test/packet/Makefile b/test/packet/Makefile
index f1cb7d9d5..c66b37c8e 100644
--- a/test/packet/Makefile
+++ b/test/packet/Makefile
@@ -9,7 +9,7 @@ ODP_APP = odp_packet
include ../Makefile.inc
include $(ODP_ROOT)/Makefile.inc
-CFLAGS += -I$(ODP_TEST_ROOT)/packet
+EXTRA_CFLAGS += -I$(ODP_TEST_ROOT)/packet
OBJS =
OBJS += $(OBJ_DIR)/odp_example_pktio.o
@@ -32,7 +32,7 @@ $(OBJ_DIR): $(DESTDIR)/lib/libodp.a
#
$(OBJ_DIR)/%.o: %.c
$(ECHO) Compiling $<
- $(CC) -c -MD $(CFLAGS) -o $@ $<
+ $(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
#
# Link rule
diff --git a/test/packet_netmap/Makefile b/test/packet_netmap/Makefile
index 5febb33c2..8d5e5e82f 100644
--- a/test/packet_netmap/Makefile
+++ b/test/packet_netmap/Makefile
@@ -6,8 +6,7 @@
ODP_ROOT = ../..
ODP_APP = odp_packet
-CFLAGS += -DODP_HAVE_NETMAP
-CFLAGS += -O0 -g
+EXTRA_CFLAGS += -DODP_HAVE_NETMAP
include ../Makefile.inc
include $(ODP_ROOT)/Makefile.inc
@@ -33,7 +32,7 @@ $(OBJ_DIR): $(DESTDIR)/lib/libodp.a
#
$(OBJ_DIR)/%.o: %.c
$(ECHO) Compiling $<
- $(CC) -c -MD $(CFLAGS) -o $@ $<
+ $(CC) -c -MD $(EXTRA_CFLAGS) $(CFLAGS) -o $@ $<
#
# Link rule