From ea34b9ef247b51afb8d0f0cfd268fe965add0de6 Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 7 Oct 2008 12:48:57 +0200 Subject: [PATCH] changed CFLAGS = -> CFLAGS += --- fwp/lib/Makefile.omk | 2 +- fwp/lib/core/Makefile.omk | 2 +- fwp/lib/fwp_fna.c | 2 +- fwp/lib/mngt/Makefile.omk | 2 +- fwp/tests/Makefile.omk | 2 +- fwp/tests/fwp_mngrtest/Makefile.omk | 2 +- fwp/tests/unixsocktest/Makefile.omk | 2 +- wme_test/Makefile.omk | 2 +- wme_test/Makefile.std | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fwp/lib/Makefile.omk b/fwp/lib/Makefile.omk index ad4598e..f85b036 100644 --- a/fwp/lib/Makefile.omk +++ b/fwp/lib/Makefile.omk @@ -1,5 +1,5 @@ lib_LIBRARIES = fwp -CFLAGS = -Wall -D_REENTRANT -g -D_FWP_INTERNALS_ +CFLAGS += -D_FWP_INTERNALS_ SUBDIRS = core mngt #LDFLAGS = -lpthread -lrt fwp_SOURCES = core/fwp_util.c core/fwp_vres.c core/fwp_msgb.c core/fwp_msgq.c\ diff --git a/fwp/lib/core/Makefile.omk b/fwp/lib/core/Makefile.omk index db5014b..50e3df4 100644 --- a/fwp/lib/core/Makefile.omk +++ b/fwp/lib/core/Makefile.omk @@ -1,5 +1,5 @@ #lib_LIBRARIES = fwp -CFLAGS = -Wall -D_REENTRANT -g -D_FWP_INTERNALS_ +CFLAGS += -Wall -D_REENTRANT -g -D_FWP_INTERNALS_ #LDFLAGS = -lpthread -lrt #fwp_SOURCES = fwp_util.c fwp_vres.c fwp_msgb.c fwp_msgq.c\ fwp_endpoint.c diff --git a/fwp/lib/fwp_fna.c b/fwp/lib/fwp_fna.c index f95b3ff..f31d0f0 100644 --- a/fwp/lib/fwp_fna.c +++ b/fwp/lib/fwp_fna.c @@ -1,4 +1,4 @@ -#include "fna.h" +#include #include "fwp_vres.h" int fwp_fna_init(const frsh_resource_id_t resource_id); diff --git a/fwp/lib/mngt/Makefile.omk b/fwp/lib/mngt/Makefile.omk index 38b3644..004c9e3 100644 --- a/fwp/lib/mngt/Makefile.omk +++ b/fwp/lib/mngt/Makefile.omk @@ -1,5 +1,5 @@ #lib_LIBRARIES = fwpmngt -CFLAGS = -Wall -D_REENTRANT -g -D_FWP_INTERNALS_ +CFLAGS += -Wall -D_REENTRANT -g -D_FWP_INTERNALS_ #LDFLAGS = -lpthread -lrt #fwpmngt_SOURCES = fwp_msg.c fwp_mngt.c diff --git a/fwp/tests/Makefile.omk b/fwp/tests/Makefile.omk index 32d12e0..bd7d1f8 100644 --- a/fwp/tests/Makefile.omk +++ b/fwp/tests/Makefile.omk @@ -1,4 +1,4 @@ SUBDIRS= fwp_msgtest fwp_vrestest fwp_prototest fwp_mngrtest -CFLAGS = -Wall -D_REENTRANT -g +CFLAGS += -Wall -D_REENTRANT -g #SUBDIRS= fwp_msgtest fwp_vrestest fwp_prototest fwp_mngrtest #fwp_mngrtest unixsocktest diff --git a/fwp/tests/fwp_mngrtest/Makefile.omk b/fwp/tests/fwp_mngrtest/Makefile.omk index 3825768..a6f460c 100644 --- a/fwp/tests/fwp_mngrtest/Makefile.omk +++ b/fwp/tests/fwp_mngrtest/Makefile.omk @@ -1,4 +1,4 @@ -CFLAGS = -g +CFLAGS += -g test_PROGRAMS = fwp_mngrtest fwp_mngrtest_SOURCES+= fwp_mngrtest.c diff --git a/fwp/tests/unixsocktest/Makefile.omk b/fwp/tests/unixsocktest/Makefile.omk index 798ddeb..ab32950 100644 --- a/fwp/tests/unixsocktest/Makefile.omk +++ b/fwp/tests/unixsocktest/Makefile.omk @@ -1,4 +1,4 @@ -CFLAGS = -Wall -D_REENTRANT -g +CFLAGS += -Wall -D_REENTRANT -g test_PROGRAMS = unixclient unixclient_thread unixclient_thread_dgram unixserver\ unixserver_dgram diff --git a/wme_test/Makefile.omk b/wme_test/Makefile.omk index 7313fea..c281533 100644 --- a/wme_test/Makefile.omk +++ b/wme_test/Makefile.omk @@ -1,6 +1,6 @@ bin_PROGRAMS = fwptester fwptesterserver -CFLAGS = -Wall -D_REENTRANT -g -O2 -DWITH_FWP +CFLAGS += -Wall -D_REENTRANT -g -O2 -DWITH_FWP lib_LOADLIBES = pthread rt fwp ulut ncurses fwptester_SOURCES = wclient.c common.c diff --git a/wme_test/Makefile.std b/wme_test/Makefile.std index c9480b5..75ce0d5 100644 --- a/wme_test/Makefile.std +++ b/wme_test/Makefile.std @@ -6,7 +6,7 @@ all: $(PROGS) .PHONY:all LDFLAGS = -lpthread -lrt -CFLAGS = -Wall -D_REENTRANT -g -O2 +CFLAGS += -Wall -D_REENTRANT -g -O2 ifdef DEBUG CFLAGS += -DDEBUG=1 endif -- 2.39.2