Page MenuHomeClusterLabs Projects
Files F1841962

No OneTemporary
Actions

View Options

diff --git a/Makefile b/Makefile
index 260235a4e..f11b29829 100644
--- a/Makefile
+++ b/Makefile
@@ -1,70 +1,69 @@
include make/defines.mk
REALSUBDIRS = gnbd-kernel/src gfs-kernel/src/gfs \
- config cman ccs dlm fence/libfenced group \
+ cman/lib config cman dlm fence/libfenced group \
fence gfs gfs2 gnbd rgmanager bindings doc
SUBDIRS = $(filter-out \
$(if ${without_gnbd-kernel/src},gnbd-kernel/src) \
$(if ${without_gfs-kernel/src/gfs},gfs-kernel/src/gfs) \
+ $(if ${without_cman},cman/lib) \
$(if ${without_cman},cman) \
- $(if ${without_ccs},ccs) \
$(if ${without_dlm},dlm) \
$(if ${without_fence},fence/libfenced) \
$(if ${without_group},group) \
$(if ${without_fence},fence) \
$(if ${without_gfs},gfs) \
$(if ${without_gfs2},gfs2) \
$(if ${without_gnbd},gnbd) \
$(if ${without_rgmanager},rgmanager) \
$(if ${without_bindings},bindings) \
, $(REALSUBDIRS))
all: ${SUBDIRS}
${SUBDIRS}:
[ -n "${without_$@}" ] || ${MAKE} -C $@ all
# Kernel
gnbd-kernel: gnbd-kernel/src
gfs-kernel: gfs-kernel/src/gfs
# Dependencies
-config:
+config: cman/lib
cman: config
-ccs: cman
dlm: config
fence/libfenced:
group: cman dlm fence/libfenced
fence: group
gfs:
gfs2: group
gnbd: cman
rgmanager: cman dlm
bindings: cman
oldconfig:
@if [ -f $(OBJDIR)/.configure.sh ]; then \
sh $(OBJDIR)/.configure.sh; \
else \
echo "No old configure data found"; \
fi
install:
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
uninstall:
set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
clean:
set -e && for i in ${REALSUBDIRS}; do ${MAKE} -C $$i $@; done
distclean: clean
rm -f make/defines.mk
rm -f .configure.sh
rm -f *tar.gz
rm -rf build
.PHONY: ${REALSUBDIRS}
diff --git a/ccs/Makefile b/ccs/Makefile
deleted file mode 100644
index 7eab21a11..000000000
--- a/ccs/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include ../make/defines.mk
-include $(OBJDIR)/make/passthrough.mk
-
-SUBDIRS=daemon man
diff --git a/ccs/man/Makefile b/ccs/man/Makefile
deleted file mode 100644
index abedd52a0..000000000
--- a/ccs/man/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET= cluster.conf.5 \
- ccs.7 \
- ccsd.8
-
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
diff --git a/config/Makefile b/config/Makefile
index 50468ed7e..abae65c9d 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -1,4 +1,4 @@
include ../make/defines.mk
include $(OBJDIR)/make/passthrough.mk
-SUBDIRS=libs plugins tools man
+SUBDIRS=libs plugins tools daemons man
diff --git a/config/daemons/Makefile b/config/daemons/Makefile
new file mode 100644
index 000000000..58121e859
--- /dev/null
+++ b/config/daemons/Makefile
@@ -0,0 +1,8 @@
+include ../../make/defines.mk
+include $(OBJDIR)/make/passthrough.mk
+
+SUBDIRS = man
+
+ifdef legacy_code
+SUBDIRS += ccsd
+endif
diff --git a/ccs/daemon/Makefile b/config/daemons/ccsd/Makefile
similarity index 83%
rename from ccs/daemon/Makefile
rename to config/daemons/ccsd/Makefile
index ade527e38..4e3efd363 100644
--- a/ccs/daemon/Makefile
+++ b/config/daemons/ccsd/Makefile
@@ -1,34 +1,37 @@
TARGET= ccsd
SBINDIRT=$(TARGET)
-all: ${TARGET}
+all: depends ${TARGET}
-include ../../make/defines.mk
+include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
OBJS= ccsd.o \
cnx_mgr.o \
cluster_mgr.o \
misc.o \
globals.o
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
CFLAGS += -I${cmanincdir} `xml2-config --cflags` -I${corosyncincdir}
-CFLAGS += -I$(S) -I$(S)/../include -I$(S)/../common
+CFLAGS += -I$(S)
CFLAGS += -I${incdir}
LDFLAGS += -L${cmanlibdir} -lcman
LDFLAGS += -L${corosynclibdir} -llogsys
LDFLAGS += `xml2-config --libs` -lpthread
LDFLAGS += -L${libdir}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
+depends:
+ $(MAKE) -C $(OBJDIR)/cman/lib all
+
clean: generalclean
-include $(OBJS:.o=.d)
diff --git a/ccs/daemon/ccsd.c b/config/daemons/ccsd/ccsd.c
similarity index 100%
rename from ccs/daemon/ccsd.c
rename to config/daemons/ccsd/ccsd.c
diff --git a/ccs/daemon/cluster_mgr.c b/config/daemons/ccsd/cluster_mgr.c
similarity index 100%
rename from ccs/daemon/cluster_mgr.c
rename to config/daemons/ccsd/cluster_mgr.c
diff --git a/ccs/daemon/cluster_mgr.h b/config/daemons/ccsd/cluster_mgr.h
similarity index 100%
rename from ccs/daemon/cluster_mgr.h
rename to config/daemons/ccsd/cluster_mgr.h
diff --git a/ccs/daemon/cnx_mgr.c b/config/daemons/ccsd/cnx_mgr.c
similarity index 100%
rename from ccs/daemon/cnx_mgr.c
rename to config/daemons/ccsd/cnx_mgr.c
diff --git a/ccs/daemon/cnx_mgr.h b/config/daemons/ccsd/cnx_mgr.h
similarity index 100%
rename from ccs/daemon/cnx_mgr.h
rename to config/daemons/ccsd/cnx_mgr.h
diff --git a/ccs/daemon/comm_headers.h b/config/daemons/ccsd/comm_headers.h
similarity index 100%
rename from ccs/daemon/comm_headers.h
rename to config/daemons/ccsd/comm_headers.h
diff --git a/ccs/daemon/debug.h b/config/daemons/ccsd/debug.h
similarity index 100%
rename from ccs/daemon/debug.h
rename to config/daemons/ccsd/debug.h
diff --git a/ccs/daemon/globals.c b/config/daemons/ccsd/globals.c
similarity index 100%
rename from ccs/daemon/globals.c
rename to config/daemons/ccsd/globals.c
diff --git a/ccs/daemon/globals.h b/config/daemons/ccsd/globals.h
similarity index 100%
rename from ccs/daemon/globals.h
rename to config/daemons/ccsd/globals.h
diff --git a/ccs/daemon/misc.c b/config/daemons/ccsd/misc.c
similarity index 100%
rename from ccs/daemon/misc.c
rename to config/daemons/ccsd/misc.c
diff --git a/ccs/daemon/misc.h b/config/daemons/ccsd/misc.h
similarity index 100%
rename from ccs/daemon/misc.h
rename to config/daemons/ccsd/misc.h
diff --git a/config/daemons/man/Makefile b/config/daemons/man/Makefile
new file mode 100644
index 000000000..cdb771205
--- /dev/null
+++ b/config/daemons/man/Makefile
@@ -0,0 +1,9 @@
+TARGET=
+
+include ../../../make/defines.mk
+
+ifdef legacy_code
+TARGET += ccsd.8
+endif
+
+include $(OBJDIR)/make/man.mk
diff --git a/ccs/man/ccsd.8 b/config/daemons/man/ccsd.8
similarity index 100%
rename from ccs/man/ccsd.8
rename to config/daemons/man/ccsd.8
diff --git a/config/libs/libccscompat/Makefile b/config/libs/libccscompat/Makefile
index e8ecae6a1..dd7db0131 100644
--- a/config/libs/libccscompat/Makefile
+++ b/config/libs/libccscompat/Makefile
@@ -1,15 +1,15 @@
TARGET= libccscompat
MAKESTATICLIB = 1
include ../../../make/defines.mk
include $(OBJDIR)/make/libs.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
CFLAGS += -D_FILE_OFFSET_BITS=64
CFLAGS += -fPIC
-CFLAGS += -I$(SRCDIR)/ccs/daemon
+CFLAGS += -I$(SRCDIR)/config/daemons/ccsd
CFLAGS += -I${incdir}
diff --git a/config/tools/ccs_tool/Makefile b/config/tools/ccs_tool/Makefile
index b696c4ec0..be8805e59 100644
--- a/config/tools/ccs_tool/Makefile
+++ b/config/tools/ccs_tool/Makefile
@@ -1,56 +1,53 @@
TARGET1 = ccs_tool
TARGET2 = ccs_test
SBINDIRT = $(TARGET1)
SBINSYMT = $(TARGET2)
include ../../../make/defines.mk
-ifdef legacy_code
-all: depends ${TARGET1} ${TARGET2}
-else
all: ${TARGET1} ${TARGET2}
-endif
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
OBJS = ccs_tool.o \
editconf.o
ifdef legacy_code
OBJS += update.o
endif
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
CFLAGS += -I${cmanincdir} `xml2-config --cflags`
-CFLAGS += -I${ccsincdir} -I$(SRCDIR)/ccs/daemon
+CFLAGS += -I${ccsincdir} -I$(SRCDIR)/config/daemons/ccsd
CFLAGS += -I$(SRCDIR)/config/libs/libccscompat
CFLAGS += -I${incdir}
LDFLAGS += -L${cmanlibdir} -lcman
ifdef legacy_code
LDFLAGS += -L$(OBJDIR)/config/libs/libccscompat -lccscompat
LDDEPS += $(OBJDIR)/config/libs/libccscompat/libccscompat.a
else
LDFLAGS += -L${ccslibdir} -lccs
endif
LDFLAGS += `xml2-config --libs`
LDFLAGS += -L${libdir}
${TARGET1}: ${OBJS} ${LDDEPS}
$(CC) -o $@ $^ $(LDFLAGS)
${TARGET2}: ${TARGET1}
ln -sf ${TARGET1} ${TARGET2}
-ifdef legacy_code
depends:
+ $(MAKE) -C $(OBJDIR)/cman/lib all
+ifdef legacy_code
$(MAKE) -C $(OBJDIR)/config/libs/libccscompat all
endif
clean: generalclean
-include $(OBJS:.o=.d)
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 353f338fc..0f62d7d81 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -1,94 +1,93 @@
# Install Locations
sbindir ?= ${DESTDIR}@SBINDIR@
initddir ?= ${DESTDIR}@INITDDIR@
libdir ?= ${DESTDIR}@LIBDIR@
libexecdir ?= ${DESTDIR}@LIBEXECDIR@
sharedir ?= ${DESTDIR}@SHAREDIR@
docdir ?= ${DESTDIR}@DOCDIR@
logdir ?= ${DESTDIR}@LOGDIR@
logrotatedir ?= ${DESTDIR}@LOGROTATEDIR@
mandir ?= ${DESTDIR}@MANDIR@
module_dir ?= @MODULE_DIR@
incdir ?= ${DESTDIR}@INCDIR@
mibdir ?= ${DESTDIR}@MIBDIR@
snmpbin ?= @SNMPBIN@
# Build information
# C Compiler defaults
CC = @CC@
AR = ar
RANLIB = ranlib
CFLAGS += @CFLAGS@ -I@SRCDIR@/make
CFLAGS += -DDEFAULT_CONFIG_DIR=\"@CONFDIR@\" -DDEFAULT_CONFIG_FILE=\"@CONFFILE@\"
CFLAGS += -DLOGDIR=\"@LOGDIR@\" -DSYSLOGFACILITY=@SYSLOGFACILITY@ -DSYSLOGLEVEL=@SYSLOGLEVEL@
LDFLAGS += @LDFLAGS@
SRCDIR = @SRCDIR@
OBJDIR = @OBJDIR@
KERNEL_BUILD = @KERNEL_BUILD@
KERNEL_SRC = @KERNEL_SRC@
gfskincdir ?= @GFSKINCDIR@
gnbdkincdir ?= @GNBDKINCDIR@
ccsincdir ?= @CCSINCDIR@
ccslibdir ?= @CCSLIBDIR@
cmanincdir ?= @CMANINCDIR@
cmanlibdir ?= @CMANLIBDIR@
dlmincdir ?= @DLMINCDIR@
dlmlibdir ?= @DLMLIBDIR@
dlmcontrolincdir ?= @DLMCONTROLINCDIR@
dlmcontrollibdir ?= @DLMCONTROLLIBDIR@
fenceincdir ?= @FENCEINCDIR@
fencelibdir ?= @FENCELIBDIR@
volidincdir ?= @VOLIDINCDIR@
volidlibdir ?= @VOLIDLIBDIR@
readlineincdir ?= @READLINEINCDIR@
readlinelibdir ?= @READLINELIBDIR@
ncursesincdir ?= @NCURSESINCDIR@
ncurseslibdir ?= @NCURSESLIBDIR@
slangincdir ?= @SLANGINCDIR@
slanglibdir ?= @SLANGLIBDIR@
nssincdir ?= @NSSINCDIR@
nsslibdir ?= @NSSLIBDIR@
nsprincdir ?= @NSPRINCDIR@
nsprlibdir ?= @NSPRLIBDIR@
corosyncincdir ?= @COROSYNCINCDIR@
corosynclibdir ?= @COROSYNCLIBDIR@
openaisincdir ?= @OPENAISINCDIR@
openaislibdir ?= @OPENAISLIBDIR@
corosyncbin ?= @COROSYNCBIN@
xenincdir ?= @XENINCDIR@
xenlibdir ?= @XENLIBDIR@
ldapincdir ?= @LDAPINCDIR@
ldaplibdir ?= @LDAPLIBDIR@
virtincdir ?= @VIRTINCDIR@
virtlibdir ?= @VIRTLIBDIR@
fence_agents ?= @FENCE_AGENTS@
fenceagentslibdir ?= @FENCEAGENTSLIBDIR@
experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@
legacy_code ?= @ENABLE_LEGACY_CODE@
enable_xen ?= @ENABLE_XEN@
without_gnbd-kernel/src ?= @DISABLE_GNBDKERNEL@
without_gfs-kernel/src/gfs ?= @DISABLE_GFSKERNEL@
without_cman/lib ?= @DISABLE_CMAN@
-without_ccs ?= @DISABLE_CCS@
without_cman ?= @DISABLE_CMAN@
without_dlm ?= @DISABLE_DLM@
without_group ?= @DISABLE_GROUP@
without_fence ?= @DISABLE_FENCE@
without_gfs ?= @DISABLE_GFS@
without_gfs2 ?= @DISABLE_GFS2@
without_gnbd ?= @DISABLE_GNBD@
without_rgmanager ?= @DISABLE_RGMANAGER@
without_bindings ?= @DISABLE_BINDINGS@
THISDIR = $(shell echo $(CURDIR) | sed -e 's|$(OBJDIR)/||g')
S=$(SRCDIR)/$(THISDIR)
CONFDIR=@CONFDIR@
CONFFILE=@CONFFILE@
UNINSTALL = perl @SRCDIR@/scripts/uninstall.pl
FENCEPARSE = bash @SRCDIR@/scripts/fenceparse

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 23, 11:03 AM (1 d, 8 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1018585
Default Alt Text
(11 KB)

Event Timeline