From mboxrd@z Thu Jan 1 00:00:00 1970 From: kupcevic@sourceware.org Date: 16 Jun 2006 20:44:25 -0000 Subject: [Cluster-devel] conga ./INSTALL ./Makefile ./autogen.sh ricci/ ... Message-ID: <20060616204425.27399.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: kupcevic at sourceware.org 2006-06-16 20:44:18 Modified files: . : INSTALL Makefile autogen.sh ricci : configure ricci/common : Makefile ricci/make : defines.mk.in ricci/modules/cluster: Makefile ricci/modules/cluster/clumon/src/cim-provider: Makefile ricci/modules/cluster/clumon/src/common: Makefile ricci/modules/cluster/clumon/src/daemon: Makefile ricci/modules/cluster/clumon/src/snmp-agent: Makefile ricci/modules/log: Makefile ricci/modules/rpm: Makefile ricci/modules/service: Makefile ricci/modules/storage: Makefile ricci/ricci : Makefile Log message: Use common build options; proper Pegasus defines on x86_64 platform Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/INSTALL.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/autogen.sh.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/configure.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/make/defines.mk.in.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/common/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11 --- conga/INSTALL 2006/06/14 21:44:34 1.1 +++ conga/INSTALL 2006/06/16 20:44:14 1.2 @@ -1,7 +1,7 @@ # installation make distclean -./autogen +./autogen.sh ./configure make su --- conga/Makefile 2006/06/14 21:44:34 1.4 +++ conga/Makefile 2006/06/16 20:44:14 1.5 @@ -19,6 +19,7 @@ all: make -C ricci make -C luci + echo "Run 'make install' to install conga (ricci and luci)" install: --- conga/autogen.sh 2006/06/14 21:44:34 1.1 +++ conga/autogen.sh 2006/06/16 20:44:14 1.2 @@ -5,8 +5,10 @@ . make/version.in -sed -e s/@@VERS@@/$VERSION/g conga.spec.in.in | \ - sed -e s/@@REL@@/$RELEASE/g > conga.spec +cat conga.spec.in.in \ + | sed -e s/@@VERS@@/$VERSION/g \ + | sed -e s/@@REL@@/$RELEASE/g \ + > conga.spec cd ricci ; ./autogen.sh ; cd .. --- conga/ricci/configure 2006/06/14 21:44:34 1.3 +++ conga/ricci/configure 2006/06/16 20:44:15 1.4 @@ -3,10 +3,10 @@ # improve me - MAKE_DEFINES=make/defines.mk + echo "# generated automaticaly by ./configure" > $MAKE_DEFINES echo "# modify make/defines.mk.in for permanent changes" >> $MAKE_DEFINES echo >> $MAKE_DEFINES @@ -16,7 +16,7 @@ echo >> $MAKE_DEFINES echo >> $MAKE_DEFINES -echo "# configure's params:" >> make/defines.mk +echo "# configure's params:" >> $MAKE_DEFINES for arg in $@ do var=`echo $arg | sed -e s,^--\\\\\(.*\\\\\)=\\\\\(.*\\\\\),\\\1\ ?=\ \\\2,` @@ -31,9 +31,22 @@ if [ "$X86_64_TMP" ]; then LIBDIR_SED=\\/lib64 fi -sed -e "s,@@LIBDIR@@,$LIBDIR_SED,g" $MAKE_DEFINES.in | sed -e "s,@@ARCH@@,`uname -m`,g" >> $MAKE_DEFINES +ARCH=`uname -m` + +# DIRTY HACK: pegasus < 2.5 used ia64 include files on x86_64 platform +# see modules/cluster/clumon/src/cim-provider/Makefile +PEGASUS_PLATFORM=$ARCH +if [ "$ARCH" = "x86_64" ] ; then + if [ ! -e /usr/include/Pegasus/Common/Platform_LINUX_X86_64_GNU.h ] ; then + PEGASUS_PLATFORM="ia64" + fi +fi +cat $MAKE_DEFINES.in \ + | sed -e s,@@LIBDIR@@,$LIBDIR_SED,g \ + | sed -e s,@@ARCH@@,$ARCH,g \ + | sed -e s,@@PEGASUS_PLATFORM@@,$PEGASUS_PLATFORM,g \ + >> $MAKE_DEFINES -exit 0 --- conga/ricci/common/Makefile 2006/04/07 16:42:39 1.5 +++ conga/ricci/common/Makefile 2006/06/16 20:44:15 1.6 @@ -11,8 +11,7 @@ top_srcdir=.. UNINSTALL = ${top_srcdir}/scripts/uninstall.pl -#include ${top_srcdir}/make/defines.mk -INCLUDE += -I $(top_srcdir)/include `xml2-config --cflags` +include ${top_srcdir}/make/defines.mk #TARGET = main @@ -34,9 +33,10 @@ Module.o -CXXFLAGS = -Wall $(INCLUDE) -CFLAGS = -Wall $(INCLUDE) -#LDFLAGS = `xml2-config --libs` -lssl ../common/*.o +INCLUDE += +CXXFLAGS += +CFLAGS += +LDFLAGS += all: $(OBJECTS) --- conga/ricci/make/defines.mk.in 2006/06/14 21:44:36 1.2 +++ conga/ricci/make/defines.mk.in 2006/06/16 20:44:15 1.3 @@ -18,10 +18,20 @@ arch ?= @@ARCH@@ pegasus_providers_dir ?= ${libdir}/Pegasus/providers + #--build=i686-redhat-linux-gnu #--host=i686-redhat-linux-gnu #--target=i386-redhat-linux-gnu +PEGASUS_PLATFORM ?= @@PEGASUS_PLATFORM@@ + +INCLUDE += -I $(top_srcdir)/include `xml2-config --cflags` +CFLAGS += -Wall -Wno-unused -fPIC -g ${INCLUDE} +CXXFLAGS += -Wall -Wno-unused -fPIC -g ${INCLUDE} +LDFLAGS += -fPIC `xml2-config --libs` -lssl -lpthread ${top_srcdir}/common/*.o -RANLIB ?= ranlib +CC = gcc +CXX = g++ +LD = g++ +RANLIB ?= ranlib --- conga/ricci/modules/cluster/Makefile 2006/06/15 03:08:36 1.9 +++ conga/ricci/modules/cluster/Makefile 2006/06/16 20:44:15 1.10 @@ -12,7 +12,6 @@ UNINSTALL = ${top_srcdir}/scripts/uninstall.pl include ${top_srcdir}/make/defines.mk -INCLUDE += -I $(top_srcdir)/include `xml2-config --cflags` TARGET = ricci-modcluster.exe @@ -25,8 +24,10 @@ Fence.o -CXXFLAGS = -Wall $(INCLUDE) -LDFLAGS = `xml2-config --libs` -lssl -lpthread ../../common/*.o +INCLUDE += +CXXFLAGS += +LDFLAGS += + all: ${TARGET} make -C clumon all @@ -56,9 +57,9 @@ $(TARGET): $(OBJECTS) - g++ -o $(TARGET) $(OBJECTS) $(LDFLAGS) + $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) main_test: main_test.o mdadm_wrapper.o - g++ -o main_test main_test.o \ + $(CXX) -o main_test main_test.o \ mdadm_wrapper.o $(LDFLAGS) --- conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile 2006/06/16 03:03:06 1.2 +++ conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile 2006/06/16 20:44:16 1.3 @@ -11,52 +11,51 @@ top_srcdir=../../../../.. UNINSTALL = ${top_srcdir}/scripts/uninstall.pl -INCLUDE = -I $(top_srcdir)/include -I ../include `xml2-config --cflags` - include ${top_srcdir}/make/defines.mk -#INCLUDE += -I ${INCLUDE_DIR} -ifeq ($(arch),i386) + +ifeq ($(PEGASUS_PLATFORM),i386) PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU endif -ifeq ($(arch),i586) +ifeq ($(PEGASUS_PLATFORM),i586) PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU endif -ifeq ($(arch),i686) +ifeq ($(PEGASUS_PLATFORM),i686) PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU endif -ifeq ($(arch),athlon) +ifeq ($(PEGASUS_PLATFORM),athlon) PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU endif -ifeq ($(arch),ia64) +ifeq ($(PEGASUS_PLATFORM),ia64) PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IA64_GNU endif -ifeq ($(arch),x86_64) +ifeq ($(PEGASUS_PLATFORM),x86_64) +# pegasus version < 2.5 doesn't define x86_64, it uses IA64 instead +# top_srcdir/configure redefines arch properly PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_X86_64_GNU endif -ifeq ($(arch),ppc) +ifeq ($(PEGASUS_PLATFORM),ppc) PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_PPC_GNU endif -ifeq ($(arch),ppc64) +ifeq ($(PEGASUS_PLATFORM),ppc64) PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_PPC64_GNU endif -ifeq ($(arch),s390) +ifeq ($(PEGASUS_PLATFORM),s390) PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_ZSERIES_GNU endif -ifeq ($(arch),s390x) +ifeq ($(PEGASUS_PLATFORM),s390x) PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_ZSERIES64_GNU endif -CXXFLAGS += $(PEGASUS_CXXFLAGS) ${INCLUDE} -#LDFLAGS += -fPIC -shared -ldl -lpthread -lcrypt \ -# -L${top_srcdir}/src/common -lClusterMonitor `xml2-config --libs` -LDFLAGS += -fPIC -shared -ldl -lpthread -lcrypt \ - ${top_srcdir}/common/*.o ../common/*.o `xml2-config --libs` +INCLUDE += -I ../include +CXXFLAGS += $(PEGASUS_CXXFLAGS) +LDFLAGS += -shared -ldl -lcrypt ../common/*.o + OBJECTS = ClusterProviderMain.o ClusterProvider.o @@ -65,7 +64,7 @@ -all: ${TARGET} $(TARGET_TEST) +all: ${TARGET} install: install -d ${pegasus_providers_dir} @@ -86,4 +85,4 @@ $(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(TARGET_TEST): clusterCIM_test.* - $(CXX) -Wall -Wno-unused ${INCLUDE} $(PEGASUS_CXXFLAGS) -lpegcommon -lpegclient -lpthread -lcrypt -o $@ $@.cpp + $(CXX) $(CXXFLAGS) -lpegcommon -lpegclient -lpthread -lcrypt -o $@ $@.cpp --- conga/ricci/modules/cluster/clumon/src/common/Makefile 2006/06/14 21:44:37 1.2 +++ conga/ricci/modules/cluster/clumon/src/common/Makefile 2006/06/16 20:44:16 1.3 @@ -12,22 +12,15 @@ UNINSTALL = ${top_srcdir}/scripts/uninstall.pl include ${top_srcdir}/make/defines.mk -INCLUDE += -I ${top_srcdir}/include -I ../include `xml2-config --cflags` TARGET = libClusterMonitor.a -#OBJECTS = ClusterMonitor.o \ -# Cluster.o Node.o Service.o \ -# Socket.o ClientSocket.o ServerSocket.o \ -# Thread.o \ -# XML.o \ -# Logger.o \ -# Time.o - OBJECTS = Cluster.o Node.o Service.o ClusterMonitor.o -CXXFLAGS = -Wall $(INCLUDE) + +INCLUDE += -I ../include +CXXFLAGS += all: ${TARGET} --- conga/ricci/modules/cluster/clumon/src/daemon/Makefile 2006/04/12 15:47:09 1.2 +++ conga/ricci/modules/cluster/clumon/src/daemon/Makefile 2006/06/16 20:44:16 1.3 @@ -11,10 +11,7 @@ top_srcdir=../../../../.. UNINSTALL = ${top_srcdir}/scripts/uninstall.pl -INCLUDE += -I ${top_srcdir}/include -I ../include `xml2-config --cflags` - include ${top_srcdir}/make/defines.mk -#INCLUDE += -I ${INCLUDE_DIR} TARGET = ricci-modclusterd @@ -22,10 +19,9 @@ Monitor.o Peer.o Communicator.o - -CXXFLAGS = -Wall $(INCLUDE) -#LDFLAGS += -lpthread -L${top_srcdir}/src/common/ -lClusterMonitor `xml2-config --libs` -LDFLAGS += -l ssl -lpthread ${top_srcdir}/common/*.o ../common/*.o `xml2-config --libs` +INCLUDE += -I ../include +CXXFLAGS += +LDFLAGS += ../common/*.o all: ${TARGET} --- conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile 2006/06/14 21:44:37 1.1 +++ conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile 2006/06/16 20:44:16 1.2 @@ -11,25 +11,16 @@ top_srcdir=../../../../.. UNINSTALL = ${top_srcdir}/scripts/uninstall.pl -INCLUDE += -I $(top_srcdir)/include -I ../include `xml2-config --cflags` - include ${top_srcdir}/make/defines.mk -#INCLUDE += -I ${INCLUDE_DIR} SNMP_CFLAGS = `net-snmp-config --cflags` -CXXFLAGS += $(SNMP_CFLAGS) $(INCLUDE) - +SNMP_LDLAGS = `net-snmp-config --libs` -#LDFLAGS += -fPIC -shared -lpthread \ -# -L${top_srcdir}/src/common -lClusterMonitor \ -# `net-snmp-config --libs` \ -# `xml2-config --libs` - -LDFLAGS += -fPIC -shared -lssl -lpthread \ - ${top_srcdir}/common/*.o ../common/*.o \ - `net-snmp-config --libs` \ - `xml2-config --libs` +INCLUDE += -I ../include +CFLAGS += $(SNMP_CFLAGS) +CXXFLAGS += $(SNMP_CFLAGS) +LDFLAGS += -shared ../common/*.o $(SNMP_LDLAGS) --- conga/ricci/modules/log/Makefile 2006/06/15 03:08:36 1.2 +++ conga/ricci/modules/log/Makefile 2006/06/16 20:44:16 1.3 @@ -12,7 +12,6 @@ UNINSTALL = ${top_srcdir}/scripts/uninstall.pl include ${top_srcdir}/make/defines.mk -INCLUDE += -I $(top_srcdir)/include `xml2-config --cflags` TARGET = ricci-modlog.exe @@ -22,8 +21,9 @@ LogParser.o -CXXFLAGS = -Wall $(INCLUDE) -LDFLAGS = `xml2-config --libs` -lssl -lpthread ../../common/*.o +INCLUDE += +CXXFLAGS += +LDFLAGS += all: ${TARGET} @@ -51,4 +51,4 @@ $(TARGET): $(OBJECTS) - g++ -o $(TARGET) $(OBJECTS) $(LDFLAGS) + $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) --- conga/ricci/modules/rpm/Makefile 2006/06/15 03:08:36 1.3 +++ conga/ricci/modules/rpm/Makefile 2006/06/16 20:44:17 1.4 @@ -12,7 +12,6 @@ UNINSTALL = ${top_srcdir}/scripts/uninstall.pl include ${top_srcdir}/make/defines.mk -INCLUDE += -I $(top_srcdir)/include `xml2-config --cflags` TARGET = ricci-modrpm.exe @@ -22,8 +21,10 @@ PackageHandler.o -CXXFLAGS = -Wall $(INCLUDE) -LDFLAGS = `xml2-config --libs` -lssl -lpthread ../../common/*.o +INCLUDE += +CXXFLAGS += +LDFLAGS += + all: ${TARGET} @@ -51,4 +52,4 @@ $(TARGET): $(OBJECTS) - g++ -o $(TARGET) $(OBJECTS) $(LDFLAGS) + $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) --- conga/ricci/modules/service/Makefile 2006/06/15 03:08:36 1.4 +++ conga/ricci/modules/service/Makefile 2006/06/16 20:44:17 1.5 @@ -12,7 +12,6 @@ UNINSTALL = ${top_srcdir}/scripts/uninstall.pl include ${top_srcdir}/make/defines.mk -INCLUDE += -I $(top_srcdir)/include `xml2-config --cflags` TARGET = ricci-modservice.exe @@ -22,8 +21,9 @@ ServiceModule.o -CXXFLAGS = -Wall $(INCLUDE) -LDFLAGS = `xml2-config --libs` -lssl -lpthread ../../common/*.o +INCLUDE += +CXXFLAGS += +LDFLAGS += all: ${TARGET} @@ -51,4 +51,4 @@ $(TARGET): $(OBJECTS) - g++ -o $(TARGET) $(OBJECTS) $(LDFLAGS) + $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) --- conga/ricci/modules/storage/Makefile 2006/06/15 03:08:37 1.6 +++ conga/ricci/modules/storage/Makefile 2006/06/16 20:44:17 1.7 @@ -12,7 +12,6 @@ UNINSTALL = ${top_srcdir}/scripts/uninstall.pl include ${top_srcdir}/make/defines.mk -INCLUDE += -I $(top_srcdir)/include `xml2-config --cflags` TARGET = ricci-modstorage.exe @@ -51,8 +50,9 @@ MDRaidTarget.o -CXXFLAGS = -Wall $(INCLUDE) -LDFLAGS = `xml2-config --libs` -lssl -lpthread ../../common/*.o +INCLUDE += +CXXFLAGS += +LDFLAGS += all: ${TARGET} @@ -80,9 +80,9 @@ $(TARGET): $(OBJECTS) - g++ -o $(TARGET) $(OBJECTS) $(LDFLAGS) + $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) main_test: main_test.o mdadm_wrapper.o - g++ -o main_test main_test.o \ + $(CXX) -o main_test main_test.o \ mdadm_wrapper.o $(LDFLAGS) --- conga/ricci/ricci/Makefile 2006/06/15 03:08:37 1.10 +++ conga/ricci/ricci/Makefile 2006/06/16 20:44:17 1.11 @@ -13,11 +13,6 @@ include ${top_srcdir}/make/defines.mk -INCLUDE += -I $(top_srcdir)/include \ - -I ${includedir}/dbus-1.0 -I ${libdir}/dbus-1.0/include \ - `xml2-config --cflags` - - TARGET = ricci TARGET_AUTH = ricci-auth TARGET_WORKER = ricci-worker @@ -40,13 +35,14 @@ #OBJECTS = dbus_test.o - #OBJECTS = ssl_test.o -CFLAGS = -Wall $(INCLUDE) -g -CXXFLAGS = ${CFLAGS} -LDFLAGS = `xml2-config --libs` -l dbus-1 -l ssl -l pthread ../common/*.o +INCLUDE += -I ${includedir}/dbus-1.0 -I ${libdir}/dbus-1.0/include +CFLAGS += +CXXFLAGS += +LDFLAGS += -l dbus-1 + all: ${TARGET} ${TARGET_AUTH} ${TARGET_WORKER} @@ -81,10 +77,10 @@ $(TARGET): $(OBJECTS) - g++ -o $(TARGET) $(OBJECTS) $(LDFLAGS) + $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) ${TARGET_AUTH}: $(TARGET_AUTH_OBJECTS) - g++ -o ${TARGET_AUTH} $(TARGET_AUTH_OBJECTS) -lpam + $(CXX) -o ${TARGET_AUTH} $(TARGET_AUTH_OBJECTS) ${LDFLAGS} -lpam ${TARGET_WORKER}: ${TARGET_WORKER_OBJECTS} - g++ -o ${TARGET_WORKER} ${TARGET_WORKER_OBJECTS} ${LDFLAGS} + $(CXX) -o ${TARGET_WORKER} ${TARGET_WORKER_OBJECTS} ${LDFLAGS}