[Cluster-devel] conga ./Makefile luci/Makefile ricci/Makefile ...
rmccabe at sourceware.org
rmccabe at sourceware.org
Sun Sep 9 14:19:38 UTC 2007
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-09-09 14:19:37
Modified files:
. : Makefile
luci : Makefile
ricci : Makefile
ricci/make : defines.mk.in
ricci/modules : Makefile
ricci/modules/cluster: Makefile
ricci/modules/cluster/clumon/src/snmp-agent: Makefile
Log message:
Fix the Makefiles to allow 'make -jX' to work
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.12.2.1&r2=1.12.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.22.2.1&r2=1.22.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.11&r2=1.11.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/make/defines.mk.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.6&r2=1.6.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.5&r2=1.5.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.15.2.1&r2=1.15.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.3&r2=1.3.4.1
--- conga/Makefile 2007/03/27 17:24:44 1.12.2.1
+++ conga/Makefile 2007/09/09 14:19:36 1.12.2.2
@@ -27,13 +27,13 @@
echo "Run 'make install_conga' to install conga"
ricci:
- make -C ricci ricci
+ ${MAKE} -C ricci ricci
luci:
- make -C luci
+ ${MAKE} -C luci
clustermon:
- make -C ricci clustermon
+ ${MAKE} -C ricci clustermon
echo "Run 'make install_clustermon' to install modcluster, cluster-cim and cluster-snmp"
@@ -42,30 +42,30 @@
install_conga: install_ricci install_luci
install_ricci:
- make -C ricci install_ricci
+ ${MAKE} -C ricci install_ricci
install_luci:
- make -C luci install
+ ${MAKE} -C luci install
install_clustermon:
- make -C ricci install_clustermon
+ ${MAKE} -C ricci install_clustermon
clean: clean_ricci clean_luci clean_clustermon
clean_ricci:
- make -C ricci clean
+ ${MAKE} -C ricci clean
clean_luci:
- make -C luci clean
+ ${MAKE} -C luci clean
clean_clustermon:
- make -C ricci clean_clustermon
+ ${MAKE} -C ricci clean_clustermon
distclean:
- make -C ricci distclean
- make -C luci distclean
+ ${MAKE} -C ricci distclean
+ ${MAKE} -C luci distclean
rm -f conga.spec conga.spec.in
rm -f conga*.tar.gz conga*.src.rpm
rm -f clustermon.spec clustermon.spec.in
--- conga/luci/Makefile 2007/04/30 18:33:18 1.22.2.1
+++ conga/luci/Makefile 2007/09/09 14:19:36 1.22.2.2
@@ -17,12 +17,12 @@
all: luci
luci:
- make -C site
- make -C conga_ssl
- make -C utils
- make -C init.d
- make -C sysconfig
- make -C docs
+ ${MAKE} -C site
+ ${MAKE} -C conga_ssl
+ ${MAKE} -C utils
+ ${MAKE} -C init.d
+ ${MAKE} -C sysconfig
+ ${MAKE} -C docs
rebuild: clean all
@@ -33,8 +33,8 @@
install -d ${libdir}/luci ; \
cd zope ; \
./configure --prefix=${libdir}/luci/zope --with-python=/usr/bin/python ; \
- make ; \
- make install ; \
+ ${MAKE} ; \
+ ${MAKE} install ; \
cd .. ; \
chmod 700 ${libdir}/luci/zope ; \
utils/remove_files ${libdir}/luci/zope ${ZOPE_REMOVES} ; \
@@ -46,31 +46,31 @@
fi
install -d -m 700 ${DESTDIR}/var/lib/luci
- make -C site install
- make -C conga_ssl install
- make -C utils install
- make -C init.d install
- make -C sysconfig install
- make -C docs install
+ ${MAKE} -C site install
+ ${MAKE} -C conga_ssl install
+ ${MAKE} -C utils install
+ ${MAKE} -C init.d install
+ ${MAKE} -C sysconfig install
+ ${MAKE} -C docs install
install -d ${DESTDIR}/usr/share/doc/luci-${VERSION}/
install -m 644 COPYING ${DESTDIR}/usr/share/doc/luci-${VERSION}/
clean:
- make -C site clean
- make -C utils clean
- make -C init.d clean
- make -C sysconfig clean
- make -C docs clean
- make -C conga_ssl clean
+ ${MAKE} -C site clean
+ ${MAKE} -C utils clean
+ ${MAKE} -C init.d clean
+ ${MAKE} -C sysconfig clean
+ ${MAKE} -C docs clean
+ ${MAKE} -C conga_ssl clean
distclean:
- make -C site distclean
- make -C utils distclean
- make -C init.d distclean
- make -C sysconfig distclean
- make -C docs distclean
- make -C conga_ssl distclean
+ ${MAKE} -C site distclean
+ ${MAKE} -C utils distclean
+ ${MAKE} -C init.d distclean
+ ${MAKE} -C sysconfig distclean
+ ${MAKE} -C docs distclean
+ ${MAKE} -C conga_ssl distclean
rm -f make/defines.mk
all_old: tar
@@ -78,22 +78,22 @@
tar:
import_storage:
- make -C storage import
+ ${MAKE} -C storage import
export_storage:
- make -e -C storage export
+ ${MAKE} -e -C storage export
import_cluster:
- make -e -C cluster import
+ ${MAKE} -e -C cluster import
export_cluster:
- make -e -C cluster export
+ ${MAKE} -e -C cluster export
import_homebase:
- make -e -C homebase import
+ ${MAKE} -e -C homebase import
export_homebase:
- make -e -C homebase export
+ ${MAKE} -e -C homebase export
import_pts: import_storage import_cluster import_homebase
export_pts: export_storage export_cluster export_homebase
--- conga/ricci/Makefile 2006/08/09 20:53:21 1.11
+++ conga/ricci/Makefile 2007/09/09 14:19:36 1.11.4.1
@@ -17,29 +17,29 @@
all: ricci clustermon
ricci:
- make -C common
- make -C ricci
- make -C modules
- make -C init.d
- make -C pam.d
+ ${MAKE} -C common
+ ${MAKE} -C ricci
+ ${MAKE} -C modules
+ ${MAKE} -C init.d
+ ${MAKE} -C pam.d
clustermon:
- make -C common
- make -C modules clustermon
+ ${MAKE} -C common
+ ${MAKE} -C modules clustermon
install: install_ricci install_clustermon
install_ricci:
$(INSTALL_DIR) -m 700 ${localstatedir}/lib/ricci
- make -C ricci install
- make -C modules install
- make -C init.d install
- make -C pam.d install
+ ${MAKE} -C ricci install
+ ${MAKE} -C modules install
+ ${MAKE} -C init.d install
+ ${MAKE} -C pam.d install
$(INSTALL_DIR) ${docdir}/ricci-${VERSION}/
$(INSTALL_FILE) COPYING ${docdir}/ricci-${VERSION}/
install_clustermon:
- make -C modules install_clustermon
+ ${MAKE} -C modules install_clustermon
$(INSTALL_DIR) ${docdir}/modcluster-${VERSION}/
$(INSTALL_FILE) COPYING ${docdir}/modcluster-${VERSION}/
@@ -47,14 +47,14 @@
uninstall:
clean:
- make -C common clean
- make -C ricci clean
- make -C modules clean
- make -C init.d clean
- make -C pam.d clean
+ ${MAKE} -C common clean
+ ${MAKE} -C ricci clean
+ ${MAKE} -C modules clean
+ ${MAKE} -C init.d clean
+ ${MAKE} -C pam.d clean
clean_clustermon:
- make -C modules clean
+ ${MAKE} -C modules clean
distclean: clean
rm -f make/defines.mk
--- conga/ricci/make/defines.mk.in 2006/08/22 23:01:17 1.6
+++ conga/ricci/make/defines.mk.in 2007/09/09 14:19:36 1.6.4.1
@@ -38,8 +38,8 @@
INCLUDE += -I $(top_srcdir)/include \
`pkg-config --cflags libxml-2.0` \
`pkg-config --cflags openssl`
-CFLAGS += -Wall -Wno-unused -fPIC -g ${INCLUDE}
-CXXFLAGS += -Wall -Wno-unused -fPIC -g ${INCLUDE}
+CFLAGS += -Wall -Wno-unused -fPIC -O2 -g ${INCLUDE}
+CXXFLAGS += -Wall -Wno-unused -fPIC -O2 -g ${INCLUDE}
LDFLAGS += -fPIC -lpthread ${top_srcdir}/common/*.o \
`pkg-config --libs libxml-2.0` \
`pkg-config --libs openssl`
--- conga/ricci/modules/Makefile 2006/08/09 20:53:22 1.5
+++ conga/ricci/modules/Makefile 2007/09/09 14:19:37 1.5.4.1
@@ -12,33 +12,33 @@
.PHONY: clustermon
all:
- make -C storage
- make -C rpm
- make -C log
- make -C service
+ ${MAKE} -C storage
+ ${MAKE} -C rpm
+ ${MAKE} -C log
+ ${MAKE} -C service
clustermon:
- make -C cluster
+ ${MAKE} -C cluster
install:
- make -C storage install
- make -C rpm install
- make -C log install
- make -C service install
+ ${MAKE} -C storage install
+ ${MAKE} -C rpm install
+ ${MAKE} -C log install
+ ${MAKE} -C service install
install_clustermon:
- make -C cluster install
+ ${MAKE} -C cluster install
uninstall:
clean:
- make -C storage clean
- make -C cluster clean
- make -C rpm clean
- make -C log clean
- make -C service clean
+ ${MAKE} -C storage clean
+ ${MAKE} -C cluster clean
+ ${MAKE} -C rpm clean
+ ${MAKE} -C log clean
+ ${MAKE} -C service clean
check:
--- conga/ricci/modules/cluster/Makefile 2007/08/09 21:29:42 1.15.2.1
+++ conga/ricci/modules/cluster/Makefile 2007/09/09 14:19:37 1.15.2.2
@@ -31,7 +31,7 @@
all: ${TARGET}
- make -C clumon all
+ ${MAKE} -C clumon all
*.o: *.h
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile 2006/06/30 22:26:13 1.3
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile 2007/09/09 14:19:37 1.3.4.1
@@ -14,7 +14,7 @@
include ${top_srcdir}/make/defines.mk
-SNMP_CFLAGS = `net-snmp-config --cflags`
+SNMP_CFLAGS = `net-snmp-config --cflags | sed -r 's/(-lcrypto|-Wdeclaration-after-statement)//g'`
SNMP_LDLAGS = `net-snmp-config --libs`
INCLUDE += -I ../include
More information about the Cluster-devel
mailing list