[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga/ricci/modules/cluster/clumon Makefile in ...



CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe sourceware org	2007-10-22 19:26:18

Modified files:
	ricci/modules/cluster/clumon: Makefile 
	ricci/modules/cluster/clumon/init.d: Makefile 
	ricci/modules/cluster/clumon/man: Makefile 
	ricci/modules/cluster/clumon/src: Makefile 

Log message:
	Cleanup makefiles to allow make -jN to work properly

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4&r2=1.4.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/init.d/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.5&r2=1.5.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/man/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2&r2=1.2.2.1

--- conga/ricci/modules/cluster/clumon/Makefile	2006/07/05 21:33:46	1.4
+++ conga/ricci/modules/cluster/clumon/Makefile	2007/10/22 19:26:17	1.4.2.1
@@ -1,54 +1,52 @@
-###############################################################################
-###############################################################################
+################################################################################
 ##
-##  Copyright (C) 2005 Red Hat, Inc.  All rights reserved.
-##  
-##  This copyrighted material is made available to anyone wishing to use,
-##  modify, copy, or redistribute it subject to the terms and conditions
-##  of the GNU General Public License v.2.
+## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved.
 ##
-###############################################################################
-###############################################################################
+## This copyrighted material is made available to anyone wishing to use,
+## modify, copy, or redistribute it subject to the terms and conditions
+## of the GNU General Public License v.2.
+##
+################################################################################
 
 top_srcdir=../../..
 UNINSTALL=${top_srcdir}/scripts/uninstall.pl
 
 include ${top_srcdir}/make/defines.mk
 
-
 all:
-	cd src && ${MAKE} all
+	${MAKE} -C src all
 
 clean:
-	cd src && ${MAKE} clean
+	${MAKE} -C src clean
 
 install:
-	cd src && ${MAKE} install
-	cd init.d && ${MAKE} install
-	cd man && ${MAKE} install
-# 	snmp
-	$(INSTALL_DIR)  ${datadir}/snmp/mibs
+	${MAKE} -C src install
+	${MAKE} -C init.d install
+	${MAKE} -C man install
+
+	# snmp
+	$(INSTALL_DIR) ${datadir}/snmp/mibs
 	$(INSTALL_FILE) REDHAT-MIB ${datadir}/snmp/mibs/
 	$(INSTALL_FILE) REDHAT-CLUSTER-MIB ${datadir}/snmp/mibs/
-	$(INSTALL_DIR)  ${docdir}/cluster-snmp-${VERSION}
+	$(INSTALL_DIR) ${docdir}/cluster-snmp-${VERSION}
 	$(INSTALL_FILE) README ${docdir}/cluster-snmp-${VERSION}/
 	$(INSTALL_FILE) README.snmpd ${docdir}/cluster-snmp-${VERSION}/
 	$(INSTALL_FILE) COPYING ${docdir}/cluster-snmp-${VERSION}/
 	$(INSTALL_FILE) REDHAT-MIB ${docdir}/cluster-snmp-${VERSION}/
 	$(INSTALL_FILE) REDHAT-CLUSTER-MIB ${docdir}/cluster-snmp-${VERSION}/
-# 	cim
-	$(INSTALL_DIR)  ${docdir}/cluster-cim-${VERSION}
+
+	# cim
+	$(INSTALL_DIR) ${docdir}/cluster-cim-${VERSION}
 	$(INSTALL_FILE) README ${docdir}/cluster-cim-${VERSION}/
 	$(INSTALL_FILE) README.cim ${docdir}/cluster-cim-${VERSION}/
 	$(INSTALL_FILE) COPYING ${docdir}/cluster-cim-${VERSION}/
 	$(INSTALL_FILE) RedHat_ClusterProvider.mof ${docdir}/cluster-cim-${VERSION}/
 	$(INSTALL_FILE) RedHat_ClusterSchema.mof ${docdir}/cluster-cim-${VERSION}/
 
-
 uninstall:
-	cd src && ${MAKE} uninstall
-	cd man && ${MAKE} uninstall
-	cd init.d && ${MAKE} uninstall
+	${MAKE} -C src uninstall
+	${MAKE} -C man uninstall
+	${MAKE} -C init.d uninstall
 	${UNINSTALL} REDHAT-MIB ${DESTDIR}/usr/share/snmp/mibs/
 	${UNINSTALL} REDHAT-CLUSTER-MIB ${DESTDIR}/usr/share/snmp/mibs/
 
@@ -56,6 +54,6 @@
 	rm -f make/defines.mk
 
 check:
-	cd src && ${MAKE} check
+	${MAKE} -C src check
 
 rebuild: clean all
--- conga/ricci/modules/cluster/clumon/init.d/Makefile	2006/08/09 20:53:22	1.5
+++ conga/ricci/modules/cluster/clumon/init.d/Makefile	2007/10/22 19:26:17	1.5.2.1
@@ -1,11 +1,12 @@
-################################################################################################################################################################
-##  Copyright (C) 2004 Red Hat, Inc.  All rights reserved.
+################################################################################
 ##
-##  This copyrighted material is made available to anyone wishing to use,
-##  modify, copy, or redistribute it subject to the terms and conditions
-##  of the GNU General Public License v.2.
+## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved.
 ##
-##############################################################################################################################################################
+## This copyrighted material is made available to anyone wishing to use,
+## modify, copy, or redistribute it subject to the terms and conditions
+## of the GNU General Public License v.2.
+##
+################################################################################
 
 top_srcdir=../../../..
 UNINSTALL=${top_srcdir}/scripts/uninstall.pl
@@ -19,8 +20,8 @@
 clean:
 
 install:
-	$(INSTALL_DIR)  ${sysconfdir}/rc.d/init.d
-	$(INSTALL_BIN)  ${TARGET} ${sysconfdir}/rc.d/init.d
+	$(INSTALL_DIR) ${sysconfdir}/rc.d/init.d
+	$(INSTALL_BIN) ${TARGET} ${sysconfdir}/rc.d/init.d
 
 uninstall:
 	${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
--- conga/ricci/modules/cluster/clumon/man/Makefile	2006/06/14 22:02:23	1.1
+++ conga/ricci/modules/cluster/clumon/man/Makefile	2007/10/22 19:26:17	1.1.2.1
@@ -1,18 +1,19 @@
-################################################################################################################################################################
-##  Copyright (C) 2004 Red Hat, Inc.  All rights reserved.
+################################################################################
 ##
-##  This copyrighted material is made available to anyone wishing to use,
-##  modify, copy, or redistribute it subject to the terms and conditions
-##  of the GNU General Public License v.2.
+## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved.
 ##
-##############################################################################################################################################################
+## This copyrighted material is made available to anyone wishing to use,
+## modify, copy, or redistribute it subject to the terms and conditions
+## of the GNU General Public License v.2.
+##
+################################################################################
 
 top_srcdir=../../../..
 UNINSTALL=${top_srcdir}/scripts/uninstall.pl
 
 include ${top_srcdir}/make/defines.mk
 
-TARGETS = 
+TARGETS =
 
 all:
 
--- conga/ricci/modules/cluster/clumon/src/Makefile	2006/06/14 21:44:36	1.2
+++ conga/ricci/modules/cluster/clumon/src/Makefile	2007/10/22 19:26:18	1.2.2.1
@@ -1,46 +1,43 @@
-###############################################################################
-###############################################################################
+################################################################################
 ##
-##  Copyright (C) 2005 Red Hat, Inc.  All rights reserved.
+## Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved.
 ##
-##  This copyrighted material is made available to anyone wishing to use,
-##  modify, copy, or redistribute it subject to the terms and conditions
-##  of the GNU General Public License v.2.
+## This copyrighted material is made available to anyone wishing to use,
+## modify, copy, or redistribute it subject to the terms and conditions
+## of the GNU General Public License v.2.
 ##
-###############################################################################
-###############################################################################
-
+################################################################################
 
 all:
-	cd common && ${MAKE} all
-	cd daemon && ${MAKE} all
-	cd snmp-agent && ${MAKE} all
-	cd cim-provider && ${MAKE} all
+	${MAKE} -C common all
+	${MAKE} -C daemon all
+	${MAKE} -C snmp-agent all
+	${MAKE} -C cim-provider all
 
 clean:
-	cd common && ${MAKE} clean
-	cd daemon && ${MAKE} clean
-	cd snmp-agent && ${MAKE} clean
-	cd cim-provider && ${MAKE} clean
+	${MAKE} -C common clean
+	${MAKE} -C daemon clean
+	${MAKE} -C snmp-agent clean
+	${MAKE} -C cim-provider clean
 
 check:
-	cd common && ${MAKE} check
-	cd daemon && ${MAKE} check
-	cd snmp-agent && ${MAKE} check
-	cd cim-provider && ${MAKE} check
+	${MAKE} -C common check
+	${MAKE} -C daemon check
+	${MAKE} -C snmp-agent check
+	${MAKE} -C cim-provider check
 
 distclean: clean
 
 install:
-	cd common && ${MAKE} install
-	cd daemon && ${MAKE} install
-	cd snmp-agent && ${MAKE} install
-	cd cim-provider && ${MAKE} install
+	${MAKE} -C common install
+	${MAKE} -C daemon install
+	${MAKE} -C snmp-agent install
+	${MAKE} -C cim-provider install
 
 uninstall:
-	cd common && ${MAKE} uninstall
-	cd daemon && ${MAKE} uninstall
-	cd snmp-agent && ${MAKE} uninstall
-	cd cim-provider && ${MAKE} uninstall
+	${MAKE} -C common uninstall
+	${MAKE} -C daemon uninstall
+	${MAKE} -C snmp-agent uninstall
+	${MAKE} -C cim-provider uninstall
 
 rebuild: clean all


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]