[Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...
fabbione at sourceware.org
fabbione at sourceware.org
Fri Jun 1 09:45:41 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-06-01 09:45:36
Modified files:
ccs/ccs_test : Makefile
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
ccs/lib : Makefile
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/lib : Makefile
cman/qdisk : Makefile
cman/tests : Makefile
dlm/lib : Makefile
dlm/tool : Makefile
fence/agents/ipmilan: Makefile
fence/agents/rackswitch: Makefile
fence/agents/rps10: Makefile
fence/agents/xvm: Makefile
fence/fence_node: Makefile
fence/fence_tool: Makefile
fence/fenced : Makefile
gfs/gfs_debug : Makefile
gfs/gfs_edit : Makefile
gfs/gfs_fsck : Makefile
gfs/gfs_grow : Makefile
gfs/gfs_jadd : Makefile
gfs/gfs_mkfs : Makefile
gfs/gfs_quota : Makefile
gfs/gfs_tool : Makefile
gfs/libgfs : Makefile
gfs-kernel/src/gfs: Makefile
gfs2/convert : Makefile
gfs2/edit : Makefile
gfs2/fsck : Makefile
gfs2/libgfs2 : Makefile
gfs2/mkfs : Makefile
gfs2/mount : Makefile
gfs2/quota : Makefile
gfs2/tool : Makefile
gnbd/client : Makefile
gnbd/server : Makefile
gnbd/tools/fence_gnbd: Makefile
gnbd/tools/gnbd_export: Makefile
gnbd/tools/gnbd_import: Makefile
group/daemon : Makefile
group/dlm_controld: Makefile
group/gfs_controld: Makefile
group/lib : Makefile
group/tool : Makefile
rgmanager/src/clulib: Makefile
rgmanager/src/daemons: Makefile
rgmanager/src/utils: Makefile
Log message:
* Fix incdir usage across the entire tree so that:
- it can override standard include paths for real
- it is always used after more specific inc overrides
* Clean up a few Makefiles to be more consistent with CFLAGS ordering
* Fix gfs-kernel/src/gfs/Makefile clean: target
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.50&r2=1.51
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/tests/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
--- cluster/ccs/ccs_test/Makefile 2007/05/15 14:37:29 1.6
+++ cluster/ccs/ccs_test/Makefile 2007/06/01 09:45:30 1.7
@@ -18,6 +18,7 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DCCS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -I${ccsincdir}
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -DDEBUG -g
--- cluster/ccs/ccs_tool/Makefile 2007/05/15 14:37:29 1.11
+++ cluster/ccs/ccs_tool/Makefile 2007/06/01 09:45:31 1.12
@@ -24,6 +24,7 @@
CFLAGS += -DCCS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -I${ccsincdir} -I${cmanincdir} `xml2-config --cflags`
CFLAGS += -I../include
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -DDEBUG -g
--- cluster/ccs/daemon/Makefile 2007/05/15 14:37:29 1.13
+++ cluster/ccs/daemon/Makefile 2007/06/01 09:45:31 1.14
@@ -24,6 +24,7 @@
CFLAGS += -Wall
CFLAGS += -I${cmanincdir} `xml2-config --cflags`
CFLAGS += -I. -I../include -I../common
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -DDEBUG -g
--- cluster/ccs/lib/Makefile 2007/05/03 16:55:51 1.6
+++ cluster/ccs/lib/Makefile 2007/06/01 09:45:31 1.7
@@ -20,6 +20,7 @@
CFLAGS += -D_FILE_OFFSET_BITS=64
CFLAGS += -fPIC
CFLAGS += -I../include -I../common
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -DDEBUG -g
--- cluster/cman/cman_tool/Makefile 2007/05/15 14:37:30 1.21
+++ cluster/cman/cman_tool/Makefile 2007/06/01 09:45:31 1.22
@@ -19,7 +19,8 @@
CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -DSBINDIR=\"${sbindir}\"
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${incdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -g -DDEBUG
--- cluster/cman/daemon/Makefile 2007/05/15 14:37:30 1.50
+++ cluster/cman/daemon/Makefile 2007/06/01 09:45:31 1.51
@@ -14,8 +14,8 @@
CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\" -DOPENAIS_EXTERNAL_SERVICE
CFLAGS += -fPIC
-CFLAGS += -I${ccsincdir} -I${incdir} -I${openaisincdir} -I${cmanincdir}
-CFLAGS += -I${openaisincdir}/openais/service
+CFLAGS += -I${ccsincdir} -I${openaisincdir} -I${cmanincdir}
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -g -DDEBUG
--- cluster/cman/lib/Makefile 2007/05/03 16:55:52 1.9
+++ cluster/cman/lib/Makefile 2007/06/01 09:45:31 1.10
@@ -20,6 +20,7 @@
CFLAGS += -g -I. -fPIC
CFLAGS += -I../daemon
+CFLAGS += -I${incdir}
all: $(STATICLIB) $(SHAREDLIB)
--- cluster/cman/qdisk/Makefile 2007/05/15 14:37:30 1.10
+++ cluster/cman/qdisk/Makefile 2007/06/01 09:45:31 1.11
@@ -14,8 +14,9 @@
CFLAGS += -D_GNU_SOURCE
CFLAGS += -Wall -Werror -Wstrict-prototypes -Wshadow -g
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${incdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
CFLAGS += -I.
+CFLAGS += -I${incdir}
EXTRA_LDFLAGS += -L${cmanlibdir} -L${ccslibdir} -lcman -lccs
EXTRA_LDFLAGS += -lpthread
--- cluster/cman/tests/Makefile 2007/04/30 11:22:02 1.6
+++ cluster/cman/tests/Makefile 2007/06/01 09:45:31 1.7
@@ -1,8 +1,9 @@
include ../../make/defines.mk
-CFLAGS+= -g -I${cmanincdir}
+CFLAGS += -g -I${cmanincdir}
+CFLAGS += -I${incdir}
-LDFLAGS+= -L${cmanlibdir} -lcman
+LDFLAGS += -L${cmanlibdir} -lcman
TARGET=client libtest sysman sysmand
--- cluster/dlm/lib/Makefile 2007/05/03 16:55:52 1.19
+++ cluster/dlm/lib/Makefile 2007/06/01 09:45:31 1.20
@@ -21,6 +21,7 @@
CFLAGS += -g -O2
CFLAGS += -I.
+CFLAGS += -I${incdir}
LDFLAGS += -lpthread
--- cluster/dlm/tool/Makefile 2007/05/18 16:39:51 1.1
+++ cluster/dlm/tool/Makefile 2007/06/01 09:45:32 1.2
@@ -18,6 +18,8 @@
CFLAGS += -g
CFLAGS += -I. -I../lib/
+CFLAGS += -I${incdir}
+
LDFLAGS += -L../lib -ldlm
all: ${TARGET}
--- cluster/fence/agents/ipmilan/Makefile 2007/05/03 16:55:52 1.5
+++ cluster/fence/agents/ipmilan/Makefile 2007/06/01 09:45:32 1.6
@@ -19,6 +19,7 @@
ipmilan.o
CFLAGS += -DFENCE_RELEASE_NAME=\"${RELEASE}\" -DFENCE
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/fence/agents/rackswitch/Makefile 2007/05/03 16:55:52 1.4
+++ cluster/fence/agents/rackswitch/Makefile 2007/06/01 09:45:32 1.5
@@ -18,8 +18,7 @@
OBJS= do_rack.o
CFLAGS += -DFENCE_RELEASE_NAME=\"${RELEASE}\"
-
-# INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/fence/agents/rps10/Makefile 2007/05/03 16:55:53 1.4
+++ cluster/fence/agents/rps10/Makefile 2007/06/01 09:45:32 1.5
@@ -18,6 +18,7 @@
OBJS= rps10.o
CFLAGS+= -DFENCE_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/fence/agents/xvm/Makefile 2007/05/03 16:55:53 1.7
+++ cluster/fence/agents/xvm/Makefile 2007/06/01 09:45:32 1.8
@@ -34,6 +34,7 @@
CFLAGS += -Wall -Werror -Wstrict-prototypes -Wshadow -ggdb
CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir}
CFLAGS += -I${virtincdir} -I${nssincdir} -I${nsprincdir}
+CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${dlmlibdir}
LDFLAGS += -L${nsslibdir} -L${nsprlibdir} -L${libdir}
--- cluster/fence/fence_node/Makefile 2007/05/03 16:55:54 1.7
+++ cluster/fence/fence_node/Makefile 2007/06/01 09:45:32 1.8
@@ -26,8 +26,9 @@
CFLAGS += -O2
endif
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${incdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
--- cluster/fence/fence_tool/Makefile 2007/05/03 16:55:54 1.14
+++ cluster/fence/fence_tool/Makefile 2007/06/01 09:45:32 1.15
@@ -18,9 +18,10 @@
OBJS= ../fenced/agent.o \
fence_tool.o
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${incdir}
-CFLAGS += -I../include -I../../group/lib
CFLAGS += -D_FILE_OFFSET_BITS=64 -DFENCE_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I../include -I../../group/lib
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -g
--- cluster/fence/fenced/Makefile 2007/05/03 16:55:54 1.9
+++ cluster/fence/fenced/Makefile 2007/06/01 09:45:32 1.10
@@ -23,8 +23,9 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -DFENCE_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -g
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${incdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
CFLAGS += -I. -I../include -I../../group/lib
+CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L../../group/lib -l group
--- cluster/gfs/gfs_debug/Makefile 2007/05/03 16:55:54 1.7
+++ cluster/gfs/gfs_debug/Makefile 2007/06/01 09:45:32 1.8
@@ -24,8 +24,9 @@
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -O2
-CFLAGS += -I${gfskincdir} -I${incdir}
+CFLAGS += -I${gfskincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/gfs/gfs_edit/Makefile 2007/05/03 16:55:54 1.8
+++ cluster/gfs/gfs_edit/Makefile 2007/06/01 09:45:33 1.9
@@ -21,6 +21,7 @@
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -I${gfskincdir} -I${ncursesincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
LDFLAGS += -L${ncurseslibdir} -lncurses
--- cluster/gfs/gfs_fsck/Makefile 2007/05/15 14:37:30 1.10
+++ cluster/gfs/gfs_fsck/Makefile 2007/06/01 09:45:33 1.11
@@ -49,6 +49,7 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -MMD -O2
CFLAGS += -I../include
+CFLAGS += -I${incdir}
all: ${TARGET1} ${TARGET2}
--- cluster/gfs/gfs_grow/Makefile 2007/05/15 14:37:31 1.9
+++ cluster/gfs/gfs_grow/Makefile 2007/06/01 09:45:33 1.10
@@ -19,8 +19,9 @@
ondisk.o
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
-CFLAGS += -I${gfskincdir} -I${incdir}
+CFLAGS += -I${gfskincdir}
CFLAGS += -I../include -I../libgfs
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs -lgfs
--- cluster/gfs/gfs_jadd/Makefile 2007/05/15 14:37:32 1.9
+++ cluster/gfs/gfs_jadd/Makefile 2007/06/01 09:45:33 1.10
@@ -19,8 +19,9 @@
ondisk.o
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
-CFLAGS += -I${gfskincdir} -I${incdir}
+CFLAGS += -I${gfskincdir}
CFLAGS += -I../include -I../libgfs
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs -lgfs
--- cluster/gfs/gfs_mkfs/Makefile 2007/05/15 14:37:32 1.9
+++ cluster/gfs/gfs_mkfs/Makefile 2007/06/01 09:45:33 1.10
@@ -25,8 +25,9 @@
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -O2
-CFLAGS += -I${gfskincdir} -I${incdir} -I${volidincdir}
+CFLAGS += -I${gfskincdir} -I${volidincdir}
CFLAGS += -I../include -I../libgfs
+CFLAGS += -I${incdir}
LDFLAGS += -L${volidlibdir} -lvolume_id
LDFLAGS += -L../libgfs -lgfs
--- cluster/gfs/gfs_quota/Makefile 2007/05/03 16:55:55 1.8
+++ cluster/gfs/gfs_quota/Makefile 2007/06/01 09:45:33 1.9
@@ -25,6 +25,7 @@
CFLAGS += -O2
CFLAGS += -I${gfskincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/gfs/gfs_tool/Makefile 2007/05/03 16:55:55 1.11
+++ cluster/gfs/gfs_tool/Makefile 2007/06/01 09:45:33 1.12
@@ -29,6 +29,7 @@
CFLAGS += -O2 -Wall
CFLAGS += -I${gfskincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/gfs/libgfs/Makefile 2007/05/15 14:37:32 1.6
+++ cluster/gfs/libgfs/Makefile 2007/06/01 09:45:33 1.7
@@ -15,11 +15,12 @@
TARGET=libgfs.a
-CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
-CFLAGS += -I${gfskincdir} -I../include
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -c -Wall -ggdb
+CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
+CFLAGS += -I${gfskincdir} -I../include
+CFLAGS += -I${incdir}
OBJS= bio.o \
bitmap.o \
--- cluster/gfs-kernel/src/gfs/Makefile 2007/04/30 11:22:15 1.15
+++ cluster/gfs-kernel/src/gfs/Makefile 2007/06/01 09:45:33 1.16
@@ -74,6 +74,6 @@
clean:
rm -rf linux *.o .*.o.cmd .gfs.ko.cmd \
- gfs.ko gfs.mod.c .tmp_versions *~ *~* Modules.symvers
+ gfs.ko gfs.mod.c .tmp_versions *~ *~* Module.symvers
distclean: clean
--- cluster/gfs2/convert/Makefile 2007/05/15 14:37:32 1.8
+++ cluster/gfs2/convert/Makefile 2007/06/01 09:45:34 1.9
@@ -18,8 +18,9 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS2_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -Wall -g
-CFLAGS += -I${incdir} -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
+CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I../include -I../libgfs2
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs2 -lgfs2
--- cluster/gfs2/edit/Makefile 2007/05/15 14:37:32 1.7
+++ cluster/gfs2/edit/Makefile 2007/06/01 09:45:34 1.8
@@ -22,6 +22,7 @@
CFLAGS += -ggdb
CFLAGS += -I${ncursesincdir}
CFLAGS += -I../include -I../libgfs2
+CFLAGS += -I${incdir}
LDFLAGS += -L${ncurseslibdir} -lncurses
LDFLAGS += -L../libgfs2/ -lgfs2
--- cluster/gfs2/fsck/Makefile 2007/05/15 14:37:33 1.11
+++ cluster/gfs2/fsck/Makefile 2007/06/01 09:45:34 1.12
@@ -38,6 +38,7 @@
CFLAGS += -MMD -Wall -O2
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I../include -I../libgfs2
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs2 -lgfs2
--- cluster/gfs2/libgfs2/Makefile 2007/05/15 14:37:33 1.7
+++ cluster/gfs2/libgfs2/Makefile 2007/06/01 09:45:34 1.8
@@ -19,8 +19,9 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CFLAGS += -D_GNU_SOURCE -DGFS2_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -Wall -ggdb
-CFLAGS += -I${incdir} -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
+CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I../include
+CFLAGS += -I${incdir}
OBJS= bitmap.o \
block_list.o \
--- cluster/gfs2/mkfs/Makefile 2007/05/15 14:37:33 1.17
+++ cluster/gfs2/mkfs/Makefile 2007/06/01 09:45:34 1.18
@@ -20,6 +20,7 @@
CFLAGS += -Wall -O2 -ggdb
CFLAGS += -I${KERNEL_SRC}/include/
CFLAGS += -I../include/ -I../libgfs2/
+CFLAGS += -I${incdir}
LDFLAGS += -L${volidlibdir} -lvolume_id
LDFLAGS += -L../libgfs2 -lgfs2
--- cluster/gfs2/mount/Makefile 2007/05/03 16:55:56 1.13
+++ cluster/gfs2/mount/Makefile 2007/06/01 09:45:34 1.14
@@ -26,8 +26,9 @@
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
CFLAGS += -DGFS2_RELEASE_NAME=\"${RELEASE}\" -D_GNU_SOURCE
CFLAGS += -O2
-CFLAGS += -I${incdir} -I${gfs2kincdir} -I${gfskincdir}
+CFLAGS += -I${gfs2kincdir} -I${gfskincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
all: ${TARGET1} ${TARGET2}
--- cluster/gfs2/quota/Makefile 2007/05/15 14:37:33 1.9
+++ cluster/gfs2/quota/Makefile 2007/06/01 09:45:34 1.10
@@ -23,6 +23,7 @@
CFLAGS += -D_GNU_SOURCE -DGFS2_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -O2
CFLAGS += -I../include -I../libgfs2/
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs2 -lgfs2
--- cluster/gfs2/tool/Makefile 2007/05/15 14:37:33 1.8
+++ cluster/gfs2/tool/Makefile 2007/06/01 09:45:34 1.9
@@ -28,6 +28,7 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -DGFS2_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -O2 -Wall
CFLAGS += -I../include
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs2 -lgfs2
--- cluster/gnbd/client/Makefile 2007/05/03 16:55:56 1.12
+++ cluster/gnbd/client/Makefile 2007/06/01 09:45:35 1.13
@@ -29,6 +29,7 @@
CFLAGS += -O2
CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
CFLAGS += -I../include -I../server -I../utils
+CFLAGS += -I${incdir}
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
--- cluster/gnbd/server/Makefile 2007/05/03 16:55:56 1.12
+++ cluster/gnbd/server/Makefile 2007/06/01 09:45:35 1.13
@@ -32,8 +32,9 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -O2
-CFLAGS += -I${gnbdkincdir} -I${incdir} -I${cmanincdir}
+CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
CFLAGS += -I../include -I../utils
+CFLAGS += -I${incdir}
LDFLAGS+= -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
--- cluster/gnbd/tools/fence_gnbd/Makefile 2007/05/03 16:55:57 1.4
+++ cluster/gnbd/tools/fence_gnbd/Makefile 2007/06/01 09:45:35 1.5
@@ -19,6 +19,7 @@
CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -I../../include -I../../tools/gnbd_import
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/05/03 16:55:57 1.13
+++ cluster/gnbd/tools/gnbd_export/Makefile 2007/06/01 09:45:35 1.14
@@ -21,8 +21,9 @@
CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\" -DDEFAULT_GETUID=\"${sbindir}/gnbd_get_uid\"
CFLAGS += -O2
-CFLAGS += -I${gnbdkincdir} -I${incdir} -I${cmanincdir}
+CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
CFLAGS += -I../../include -I../../server -I../../utils
+CFLAGS += -I${incdir}
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/05/03 16:55:57 1.10
+++ cluster/gnbd/tools/gnbd_import/Makefile 2007/06/01 09:45:35 1.11
@@ -24,6 +24,7 @@
CFLAGS += -O2
CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
CFLAGS += -I../../include -I../../client -I../../server -I../../utils
+CFLAGS += -I${incdir}
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
--- cluster/group/daemon/Makefile 2007/05/03 16:55:57 1.18
+++ cluster/group/daemon/Makefile 2007/06/01 09:45:35 1.19
@@ -23,6 +23,7 @@
CFLAGS += -g
CFLAGS += -I${cmanincdir}
CFLAGS += -I. -I../include/ -I../lib/
+CFLAGS += -I${incdir}
LDFLAGS += -L${cmanlibdir} -L${openaislibdir} -L${libdir} -lcman -lcpg
--- cluster/group/dlm_controld/Makefile 2007/05/15 14:37:33 1.6
+++ cluster/group/dlm_controld/Makefile 2007/06/01 09:45:35 1.7
@@ -20,9 +20,10 @@
action.o
CFLAGS += -g
-CFLAGS += -I${incdir} -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
CFLAGS += -idirafter ${KERNEL_SRC}/include/linux
CFLAGS += -I../../group/lib/ -I../include/
+CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L../lib -lgroup
--- cluster/group/gfs_controld/Makefile 2007/05/15 14:37:34 1.9
+++ cluster/group/gfs_controld/Makefile 2007/06/01 09:45:35 1.10
@@ -22,9 +22,10 @@
recover.o
CFLAGS += -g -O2
-CFLAGS += -I${cmanincdir} -I${incdir}
+CFLAGS += -I${cmanincdir}
CFLAGS += -idirafter ${KERNEL_SRC}/include/linux
CFLAGS += -I../include/ -I../lib/
+CFLAGS += -I${incdir}
LDFLAGS += -L${cmanlibdir} -L${openaislibdir} -L${libdir} -lcman -lcpg -lSaCkpt
LDFLAGS += -L../lib -lgroup
--- cluster/group/lib/Makefile 2007/05/03 16:55:58 1.5
+++ cluster/group/lib/Makefile 2007/06/01 09:45:35 1.6
@@ -17,6 +17,7 @@
CFLAGS += -g -O -fPIC
CFLAGS += -I. -I../daemon
+CFLAGS += -I${incdir}
all: $(STATICLIB)
--- cluster/group/tool/Makefile 2007/05/15 14:37:34 1.9
+++ cluster/group/tool/Makefile 2007/06/01 09:45:36 1.10
@@ -18,6 +18,8 @@
CFLAGS += -g
CFLAGS += -I. -I../lib/ -I../daemon/
+CFLAGS += -I${incdir}
+
LDFLAGS += -L../lib -lgroup
all: depends ${TARGET}
--- cluster/rgmanager/src/clulib/Makefile 2007/05/03 16:55:59 1.14
+++ cluster/rgmanager/src/clulib/Makefile 2007/06/01 09:45:36 1.15
@@ -27,8 +27,9 @@
CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
-CFLAGS += -I${incdir} -I${cmanincdir} -I${dlmincdir}
+CFLAGS += -I${cmanincdir} -I${dlmincdir}
CFLAGS += -I../../include
+CFLAGS += -I${incdir}
LDFLAGS += -L${cmanlibdir} -lcman
LDFLAGS += -L. -lclulib -llalloc
--- cluster/rgmanager/src/daemons/Makefile 2007/05/15 14:37:36 1.21
+++ cluster/rgmanager/src/daemons/Makefile 2007/06/01 09:45:36 1.22
@@ -49,9 +49,10 @@
CFLAGS += -D_GNU_SOURCE -DSHAREDIR=\"${sharedir}\"
CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC
-CFLAGS += -I${incdir} -I${ccsincdir} -I${cmanincdir} -I${dlmincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir}
CFLAGS += `xml2-config --cflags` -I${readlineincdir}
CFLAGS += -I../../include
+CFLAGS += -I${incdir}
EXTRA_CFLAGS += -DNO_CCS
--- cluster/rgmanager/src/utils/Makefile 2007/05/15 14:37:37 1.16
+++ cluster/rgmanager/src/utils/Makefile 2007/06/01 09:45:36 1.17
@@ -23,8 +23,9 @@
CFLAGS += -DPACKAGE_VERSION=\"${RELEASE}\"
CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
-CFLAGS += -I${incdir} -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${ncursesincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${ncursesincdir}
CFLAGS += -I../../include
+CFLAGS += -I${incdir}
LDFLAGS += -L${libdir} -L${ccslibdir} -L${cmanlibdir} -L${ncurseslibdir}
LDFLAGS += -lcman -lpthread -ldl -lncurses -lccs
More information about the Cluster-devel
mailing list