[pisa-src] r1137 - in trunk: community-operator/Makefile.am libpisa/Makefile.am pisacd/Makefile.am pisand/Makefile.am pisasd/Makefile.am test/Makefile.am
- From: Thomas Jansen <mithi@xxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Wed, 14 Oct 2009 13:28:02 +0200
Author: tjansen
Date: Wed Oct 14 13:28:01 2009
New Revision: 1137
Log:
Removed duplicate -I options from calls to gcc.
Several Makefile.am in the subdirectories blindly set INCLUDES, even though
the central include directory is automatically. This results in long command
lines with static include paths. For comparison:
before:
gcc -DHAVE_CONFIG_H -I. -I../include -I/home/mithi/nfs/svn/trunk/include -g
-O2 -Wall -g -MT cdmain.o -MD -MP -MF .deps/cdmain.Tpo -c -o cdmain.o cdmain.c
after:
gcc -DHAVE_CONFIG_H -I. -I../include -g -O2 -Wall -g -MT cdmain.o -MD -MP
-MF .deps/cdmain.Tpo -c -o cdmain.o cdmain.c
Modified:
trunk/community-operator/Makefile.am
trunk/libpisa/Makefile.am
trunk/pisacd/Makefile.am
trunk/pisand/Makefile.am
trunk/pisasd/Makefile.am
trunk/test/Makefile.am
Modified: trunk/community-operator/Makefile.am
==============================================================================
--- trunk/community-operator/Makefile.am Wed Oct 14 11:06:13 2009
(r1136)
+++ trunk/community-operator/Makefile.am Wed Oct 14 13:28:01 2009
(r1137)
@@ -3,8 +3,6 @@
#
# Author: Thomas Jansen <mithi@xxxxxxxxx>
-INCLUDES = -I$(PISA_COMMON_INCLUDES)
-
bin_PROGRAMS = co_server co_client
co_serverdir = .
@@ -25,7 +23,7 @@
if PISA_WITH_HIPL
# Things needed for compiling hipl-related codes
-INCLUDES += -I@PISA_HIPL_SRCDIR@/libinet6/include
+INCLUDES = -I@PISA_HIPL_SRCDIR@/libinet6/include
INCLUDES += -I@PISA_HIPL_SRCDIR@/libinet6
INCLUDES += -I@PISA_HIPL_SRCDIR@/libhiptool
INCLUDES += -I@PISA_HIPL_SRCDIR@/libdht
Modified: trunk/libpisa/Makefile.am
==============================================================================
--- trunk/libpisa/Makefile.am Wed Oct 14 11:06:13 2009 (r1136)
+++ trunk/libpisa/Makefile.am Wed Oct 14 13:28:01 2009 (r1137)
@@ -12,5 +12,4 @@
libpisa_la_SOURCES += log.c
endif
-INCLUDES = -I$(PISA_COMMON_INCLUDES) -I$(PISA_LIBPISA_INCLUDES)
CFLAGS += -Wall -g
Modified: trunk/pisacd/Makefile.am
==============================================================================
--- trunk/pisacd/Makefile.am Wed Oct 14 11:06:13 2009 (r1136)
+++ trunk/pisacd/Makefile.am Wed Oct 14 13:28:01 2009 (r1137)
@@ -4,7 +4,6 @@
# Author: Dongsu Park <dpark1978@xxxxxxxxx>
CFLAGS += -Wall -g
-INCLUDES = -I$(PISA_COMMON_INCLUDES)
bin_PROGRAMS = pisacdconf
sbin_PROGRAMS = pisacd
Modified: trunk/pisand/Makefile.am
==============================================================================
--- trunk/pisand/Makefile.am Wed Oct 14 11:06:13 2009 (r1136)
+++ trunk/pisand/Makefile.am Wed Oct 14 13:28:01 2009 (r1137)
@@ -4,7 +4,6 @@
# Author: Dongsu Park <dpark1978@xxxxxxxxx>
CFLAGS += -Wall -g
-INCLUDES = -I$(PISA_COMMON_INCLUDES)
sbin_PROGRAMS = pisand
Modified: trunk/pisasd/Makefile.am
==============================================================================
--- trunk/pisasd/Makefile.am Wed Oct 14 11:06:13 2009 (r1136)
+++ trunk/pisasd/Makefile.am Wed Oct 14 13:28:01 2009 (r1137)
@@ -4,7 +4,6 @@
# Author: Dongsu Park <dpark1978@xxxxxxxxx>
CFLAGS += -Wall -g
-INCLUDES = -I$(PISA_COMMON_INCLUDES)
bin_PROGRAMS = pisasdconf
sbin_PROGRAMS = pisasd
Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am Wed Oct 14 11:06:13 2009 (r1136)
+++ trunk/test/Makefile.am Wed Oct 14 13:28:01 2009 (r1137)
@@ -7,8 +7,7 @@
CFLAGS += -Wall -g
-INCLUDES = -I$(PISA_COMMON_INCLUDES)
-INCLUDES += -I@PISA_PISACD_INCLUDES@
+INCLUDES = -I@PISA_PISACD_INCLUDES@
INCLUDES += -I@PISA_PISAND_INCLUDES@
INCLUDES += -I@PISA_PISASD_INCLUDES@
Other related posts:
- » [pisa-src] r1137 - in trunk: community-operator/Makefile.am libpisa/Makefile.am pisacd/Makefile.am pisand/Makefile.am pisasd/Makefile.am test/Makefile.am - Thomas Jansen
