[Cluster-devel] conga/ricci Makefile common/Makefile modules/l ...
rmccabe at sourceware.org
rmccabe at sourceware.org
Tue Sep 11 02:42:56 UTC 2007
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-09-11 02:42:53
Modified files:
ricci : Makefile
ricci/common : Makefile
ricci/modules/log: Makefile
ricci/modules/cluster/clumon/src/common: Makefile
ricci/modules/cluster/clumon/src/snmp-agent: Makefile
ricci/modules/cluster/clumon/src/daemon: Makefile
ricci/modules/cluster/clumon/src/cim-provider: Makefile
ricci/modules/cluster/clumon/src: Makefile
ricci/modules/cluster/clumon/init.d: Makefile
ricci/modules/cluster/clumon/man: Makefile
ricci/modules/cluster/clumon: Makefile
ricci/modules/cluster: Makefile
ricci/modules/service: Makefile
ricci/modules : Makefile
ricci/modules/rpm: Makefile
ricci/modules/storage: Makefile
ricci/init.d : Makefile
ricci/ricci : Makefile
ricci/pam.d : Makefile
Log message:
More makefile cleanup
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/common/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/init.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/man/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/init.d/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/pam.d/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
--- conga/ricci/Makefile 2007/09/09 14:18:37 1.12
+++ conga/ricci/Makefile 2007/09/11 02:42:49 1.13
@@ -1,15 +1,13 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
-
-#include make/version.in
include make/defines.mk
.PHONY: ricci
@@ -29,22 +27,21 @@
install: install_ricci install_clustermon
-install_ricci:
- $(INSTALL_DIR) -m 700 ${localstatedir}/lib/ricci
+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
- $(INSTALL_DIR) ${docdir}/ricci-${VERSION}/
- $(INSTALL_FILE) COPYING ${docdir}/ricci-${VERSION}/
+ ${INSTALL_DIR} ${docdir}/ricci-${VERSION}/
+ ${INSTALL_FILE} COPYING ${docdir}/ricci-${VERSION}/
install_clustermon:
${MAKE} -C modules install_clustermon
- $(INSTALL_DIR) ${docdir}/modcluster-${VERSION}/
- $(INSTALL_FILE) COPYING ${docdir}/modcluster-${VERSION}/
-
+ ${INSTALL_DIR} ${docdir}/modcluster-${VERSION}/
+ ${INSTALL_FILE} COPYING ${docdir}/modcluster-${VERSION}/
-uninstall:
+uninstall:
clean:
${MAKE} -C common clean
@@ -53,12 +50,12 @@
${MAKE} -C init.d clean
${MAKE} -C pam.d clean
-clean_clustermon:
+clean_clustermon:
${MAKE} -C modules clean
distclean: clean
rm -f make/defines.mk
-check:
+check:
rebuild: clean all
--- conga/ricci/common/Makefile 2007/09/09 18:20:00 1.12
+++ conga/ricci/common/Makefile 2007/09/11 02:42:49 1.13
@@ -14,8 +14,6 @@
include ${top_srcdir}/make/defines.mk
-#TARGET = main
-
OBJECTS = \
Except.o \
executils.o \
@@ -37,12 +35,14 @@
base64.o \
sys_util.o
-INCLUDE +=
+INCLUDE +=
CXXFLAGS +=
CXXFLAGS_PARANOIA = -DPARANOIA=1
CFLAGS_PARANOIA = -DPARANOIA=1
-CFLAGS +=
-LDFLAGS +=
+CFLAGS +=
+LDFLAGS +=
+
+.PHONY: prep
all: prep compile
@@ -56,9 +56,9 @@
$(CC) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c $<
$(CC) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_PARANOIA) -c $< -o ${top_srcdir}/common/paranoid/$@
-install:
+install:
-uninstall:
+uninstall:
clean:
rm -rf ${top_srcdir}/common/paranoid/
@@ -67,6 +67,6 @@
prep:
@mkdir ${top_srcdir}/common/paranoid/ 2>/dev/null ||:
-check:
+check:
rebuild: clean all
--- conga/ricci/modules/log/Makefile 2007/09/07 19:07:22 1.7
+++ conga/ricci/modules/log/Makefile 2007/09/11 02:42:49 1.8
@@ -1,28 +1,26 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=../..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
include ${top_srcdir}/make/defines.mk
-
TARGET = ricci-modlog
OBJECTS = main.o \
LoggingModule.o \
LogParser.o
-
-INCLUDE +=
-CXXFLAGS += -DPARANOIA=$(PARANOID)
+INCLUDE +=
+CXXFLAGS += -DPARANOIA=$(PARANOID)
ifeq ($(PARANOID), 1)
LDFLAGS += ${top_srcdir}/common/paranoid/*.o
@@ -35,25 +33,22 @@
*.o: *.h
-
-install:
- $(INSTALL_DIR) ${libexecdir}
- $(INSTALL_BIN) ${TARGET} ${libexecdir}
- $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
+install:
+ $(INSTALL_DIR) ${libexecdir}
+ $(INSTALL_BIN) ${TARGET} ${libexecdir}
+ $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
$(INSTALL_FILE) d-bus/ricci-modlog.oddjob.conf ${sysconfdir}/oddjobd.conf.d
- $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
$(INSTALL_FILE) d-bus/ricci-modlog.systembus.conf ${sysconfdir}/dbus-1/system.d
-
-uninstall:
+uninstall:
clean:
rm -f $(OBJECTS) $(TARGET)
-check:
+check:
rebuild: clean all
-
-$(TARGET): $(OBJECTS)
+$(TARGET): $(OBJECTS)
$(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS)
--- conga/ricci/modules/cluster/clumon/src/common/Makefile 2007/09/07 19:07:22 1.4
+++ conga/ricci/modules/cluster/clumon/src/common/Makefile 2007/09/11 02:42:49 1.5
@@ -1,40 +1,38 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=../../../../..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
include ${top_srcdir}/make/defines.mk
-
TARGET = libClusterMonitor.a
OBJECTS = Cluster.o Node.o Service.o ClusterMonitor.o
-INCLUDE += -I ../include
-CXXFLAGS += -DPARANOIA=$(PARANOID)
+INCLUDE += -I ../include
+CXXFLAGS += -DPARANOIA=$(PARANOID)
all: ${TARGET}
-install:
+install:
-uninstall:
+uninstall:
clean:
rm -f $(OBJECTS) $(TARGET)
-check:
+check:
rebuild: clean all
-
-$(TARGET): $(OBJECTS)
+$(TARGET): $(OBJECTS)
$(AR) rc $(TARGET) $(OBJECTS)
$(RANLIB) $(TARGET)
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile 2007/09/09 14:18:37 1.5
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/Makefile 2007/09/11 02:42:50 1.6
@@ -1,26 +1,25 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=../../../../..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
include ${top_srcdir}/make/defines.mk
-
SNMP_CFLAGS = `net-snmp-config --cflags | sed -r 's/(-lcrypto|-Wdeclaration-after-statement)//g'`
SNMP_LDLAGS = `net-snmp-config --libs`
-INCLUDE += -I ../include
-CFLAGS += $(SNMP_CFLAGS) -DPARANOIA=$(PARANOID)
-CXXFLAGS += $(SNMP_CFLAGS) -DPARANOIA=$(PARANOID)
-LDFLAGS += -shared $(SNMP_LDLAGS)
+INCLUDE += -I ../include
+CFLAGS += $(SNMP_CFLAGS) -DPARANOIA=$(PARANOID)
+CXXFLAGS += $(SNMP_CFLAGS) -DPARANOIA=$(PARANOID)
+LDFLAGS += -shared $(SNMP_LDLAGS)
ifeq ($(PARANOID), 1)
LDFLAGS += ${top_srcdir}/common/paranoid/*.o
@@ -30,32 +29,33 @@
OBJECTS = clusterMonitorSnmp.o \
clusterMIB.o \
- nodesMIB.o nodesMIB_access.o nodesMIB_checkfns.o \
+ nodesMIB.o \
+ nodesMIB_access.o \
+ nodesMIB_checkfns.o \
nodesMIB_checkfns_local.o \
- servicesMIB.o servicesMIB_access.o \
- servicesMIB_checkfns.o servicesMIB_checkfns_local.o
+ servicesMIB.o \
+ servicesMIB_access.o \
+ servicesMIB_checkfns.o \
+ servicesMIB_checkfns_local.o
TARGET = libClusterMonitorSnmp.so
-
all: ${TARGET}
-
-install:
+install:
$(INSTALL_DIR) ${libdir}/cluster-snmp
$(INSTALL_LIB) ${TARGET} ${libdir}/cluster-snmp
-uninstall:
+uninstall:
${UNINSTALL} ${TARGET} ${libdir}/cluster-snmp
clean:
rm -f $(OBJECTS) $(TARGET)
-check:
+check:
rebuild: clean all
-
$(TARGET): $(OBJECTS)
$(CXX) $(LDFLAGS) -o $@ $(OBJECTS)
--- conga/ricci/modules/cluster/clumon/src/daemon/Makefile 2007/09/07 19:07:22 1.7
+++ conga/ricci/modules/cluster/clumon/src/daemon/Makefile 2007/09/11 02:42:50 1.8
@@ -1,12 +1,12 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=../../../../..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
@@ -16,11 +16,13 @@
TARGET = modclusterd
OBJECTS = main.o \
- Monitor.o Peer.o Communicator.o
-
-INCLUDE += -I ../include
-CXXFLAGS += -DPARANOIA=$(PARANOID)
-LDFLAGS += ../common/*.o
+ Monitor.o \
+ Peer.o \
+ Communicator.o
+
+INCLUDE += -I ../include
+CXXFLAGS += -DPARANOIA=$(PARANOID)
+LDFLAGS += ../common/*.o
ifeq ($(PARANOID), 1)
LDFLAGS += ${top_srcdir}/common/paranoid/*.o
@@ -30,17 +32,17 @@
all: ${TARGET}
-install:
+install:
$(INSTALL_DIR) ${sbindir}
$(INSTALL_BIN) ${TARGET} ${sbindir}
-uninstall:
+uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
clean:
rm -f $(OBJECTS) $(TARGET)
-check:
+check:
rebuild: clean all
--- conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile 2007/09/07 19:07:22 1.5
+++ conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile 2007/09/11 02:42:50 1.6
@@ -1,12 +1,12 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=../../../../..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
@@ -15,46 +15,50 @@
ifeq ($(PEGASUS_PLATFORM),i386)
-PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU
+ PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU
endif
+
ifeq ($(PEGASUS_PLATFORM),i586)
-PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU
+ PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU
endif
+
ifeq ($(PEGASUS_PLATFORM),i686)
-PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU
+ PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU
endif
+
ifeq ($(PEGASUS_PLATFORM),athlon)
-PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU
+ PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU
endif
+
ifeq ($(PEGASUS_PLATFORM),ia64)
-PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IA64_GNU
+ PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IA64_GNU
endif
+
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
+ PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_X86_64_GNU
endif
ifeq ($(PEGASUS_PLATFORM),ppc)
-PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_PPC_GNU
+ PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_PPC_GNU
endif
+
ifeq ($(PEGASUS_PLATFORM),ppc64)
-PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_PPC64_GNU
+ PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_PPC64_GNU
endif
ifeq ($(PEGASUS_PLATFORM),s390)
-PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_ZSERIES_GNU
+ PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_ZSERIES_GNU
endif
+
ifeq ($(PEGASUS_PLATFORM),s390x)
-PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_ZSERIES64_GNU
+ PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_ZSERIES64_GNU
endif
-
-
-
-INCLUDE += -I ../include
-CXXFLAGS += $(PEGASUS_CXXFLAGS) -DPARANOIA=$(PARANOID)
-LDFLAGS += -shared -ldl -lcrypt
+INCLUDE += -I ../include
+CXXFLAGS += $(PEGASUS_CXXFLAGS) -DPARANOIA=$(PARANOID)
+LDFLAGS += -shared -ldl -lcrypt
ifeq ($(PARANOID), 1)
LDFLAGS += ${top_srcdir}/common/paranoid/*.o
@@ -68,26 +72,24 @@
TARGET_TEST = clusterCIM_test
-
all: ${TARGET}
-install:
+install:
$(INSTALL_DIR) ${pegasus_providers_dir}
$(INSTALL_LIB) ${TARGET} ${pegasus_providers_dir}
-uninstall:
+uninstall:
${UNINSTALL} ${TARGET} ${pegasus_providers_dir}
clean:
rm -f $(OBJECTS) $(TARGET) $(TARGET_TEST)
-check:
+check:
rebuild: clean all
-
$(TARGET): $(OBJECTS)
$(CXX) $(LDFLAGS) -o $@ $(OBJECTS)
$(TARGET_TEST): clusterCIM_test.*
- $(CXX) $(CXXFLAGS) -lpegcommon -lpegclient -lpthread -lcrypt -o $@ $@.cpp
+ $(CXX) $(CXXFLAGS) -lpegcommon -lpegclient -lpthread -lcrypt -o $@ $@.cpp
--- conga/ricci/modules/cluster/clumon/src/Makefile 2006/06/14 21:44:36 1.2
+++ conga/ricci/modules/cluster/clumon/src/Makefile 2007/09/11 02:42:50 1.3
@@ -1,15 +1,12 @@
-###############################################################################
-###############################################################################
+################################################################################
##
-## 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
--- 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/09/11 02:42:50 1.6
@@ -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/09/11 02:42:51 1.2
@@ -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/Makefile 2006/07/05 21:33:46 1.4
+++ conga/ricci/modules/cluster/clumon/Makefile 2007/09/11 02:42:51 1.5
@@ -1,21 +1,18 @@
-###############################################################################
-###############################################################################
+################################################################################
##
-## 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
@@ -27,24 +24,23 @@
cd init.d && ${MAKE} install
cd man && ${MAKE} install
# snmp
- $(INSTALL_DIR) ${datadir}/snmp/mibs
+ $(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}
+ $(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
--- conga/ricci/modules/cluster/Makefile 2007/09/09 14:18:37 1.18
+++ conga/ricci/modules/cluster/Makefile 2007/09/11 02:42:51 1.19
@@ -1,12 +1,12 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=../..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
@@ -25,8 +25,8 @@
Virt.o
PARANOID=0
-INCLUDE += -I${top_srcdir}/common/
-CXXFLAGS += -DPARANOIA=$(PARANOID)
+INCLUDE += -I${top_srcdir}/common/
+CXXFLAGS += -DPARANOIA=$(PARANOID)
ifeq ($(PARANOID), 1)
LDFLAGS += ${top_srcdir}/common/paranoid/*.o
@@ -39,31 +39,27 @@
*.o: *.h
-
-install:
- $(INSTALL_DIR) ${libexecdir}
- $(INSTALL_BIN) ${TARGET} ${libexecdir}
- $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
+install:
+ $(INSTALL_DIR) ${libexecdir}
+ $(INSTALL_BIN) ${TARGET} ${libexecdir}
+ $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
$(INSTALL_FILE) d-bus/modcluster.oddjob.conf ${sysconfdir}/oddjobd.conf.d
- $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
$(INSTALL_FILE) d-bus/modcluster.systembus.conf ${sysconfdir}/dbus-1/system.d
- make -C clumon install
+ ${MAKE} -C clumon install
-uninstall:
+uninstall:
clean:
rm -f $(OBJECTS) $(TARGET)
- make -C clumon clean
+ ${MAKE} -C clumon clean
-check:
+check:
rebuild: clean all
-
-$(TARGET): $(OBJECTS)
+$(TARGET): $(OBJECTS)
$(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS)
-
main_test: main_test.o mdadm_wrapper.o
- $(CXX) -o main_test main_test.o \
- mdadm_wrapper.o $(LDFLAGS)
+ $(CXX) -o main_test main_test.o mdadm_wrapper.o $(LDFLAGS)
--- conga/ricci/modules/service/Makefile 2007/09/07 19:07:23 1.9
+++ conga/ricci/modules/service/Makefile 2007/09/11 02:42:51 1.10
@@ -1,12 +1,12 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=../..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
@@ -20,9 +20,8 @@
ServiceManager.o \
ServiceModule.o
-
-INCLUDE +=
-CXXFLAGS += -DPARANOIA=$(PARANOID)
+INCLUDE +=
+CXXFLAGS += -DPARANOIA=$(PARANOID)
ifeq ($(PARANOID), 1)
LDFLAGS += ${top_srcdir}/common/paranoid/*.o
@@ -34,25 +33,22 @@
*.o: *.h
-
-install:
- $(INSTALL_DIR) ${libexecdir}
- $(INSTALL_BIN) ${TARGET} ${libexecdir}
- $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
+install:
+ $(INSTALL_DIR) ${libexecdir}
+ $(INSTALL_BIN) ${TARGET} ${libexecdir}
+ $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
$(INSTALL_FILE) d-bus/ricci-modservice.oddjob.conf ${sysconfdir}/oddjobd.conf.d
- $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
$(INSTALL_FILE) d-bus/ricci-modservice.systembus.conf ${sysconfdir}/dbus-1/system.d
-
-uninstall:
+uninstall:
clean:
rm -f $(OBJECTS) $(TARGET)
-check:
+check:
rebuild: clean all
-
-$(TARGET): $(OBJECTS)
+$(TARGET): $(OBJECTS)
$(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS)
--- conga/ricci/modules/Makefile 2007/09/09 14:18:37 1.6
+++ conga/ricci/modules/Makefile 2007/09/11 02:42:51 1.7
@@ -1,28 +1,25 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
-
+################################################################################
.PHONY: clustermon
-all:
+all:
${MAKE} -C storage
${MAKE} -C rpm
${MAKE} -C log
${MAKE} -C service
-
clustermon:
${MAKE} -C cluster
-
-install:
+install:
${MAKE} -C storage install
${MAKE} -C rpm install
${MAKE} -C log install
@@ -31,7 +28,7 @@
install_clustermon:
${MAKE} -C cluster install
-uninstall:
+uninstall:
clean:
${MAKE} -C storage clean
@@ -40,9 +37,6 @@
${MAKE} -C log clean
${MAKE} -C service clean
-
-check:
+check:
rebuild: clean all
-
-
--- conga/ricci/modules/rpm/Makefile 2007/09/07 19:07:23 1.8
+++ conga/ricci/modules/rpm/Makefile 2007/09/11 02:42:51 1.9
@@ -1,12 +1,12 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=../..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
@@ -21,8 +21,8 @@
PackageHandler.o
-INCLUDE +=
-CXXFLAGS += -DPARANOIA=$(PARANOID)
+INCLUDE +=
+CXXFLAGS += -DPARANOIA=$(PARANOID)
ifeq ($(PARANOID), 1)
LDFLAGS += ${top_srcdir}/common/paranoid/*.o
@@ -35,25 +35,22 @@
*.o: *.h
-
-install:
- $(INSTALL_DIR) ${libexecdir}
- $(INSTALL_BIN) ${TARGET} ${libexecdir}
- $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
+install:
+ $(INSTALL_DIR) ${libexecdir}
+ $(INSTALL_BIN) ${TARGET} ${libexecdir}
+ $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
$(INSTALL_FILE) d-bus/ricci-modrpm.oddjob.conf ${sysconfdir}/oddjobd.conf.d
- $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
$(INSTALL_FILE) d-bus/ricci-modrpm.systembus.conf ${sysconfdir}/dbus-1/system.d
-
-uninstall:
+uninstall:
clean:
rm -f $(OBJECTS) $(TARGET)
-check:
+check:
rebuild: clean all
-
-$(TARGET): $(OBJECTS)
+$(TARGET): $(OBJECTS)
$(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS)
--- conga/ricci/modules/storage/Makefile 2007/09/07 19:07:23 1.14
+++ conga/ricci/modules/storage/Makefile 2007/09/11 02:42:52 1.15
@@ -1,12 +1,12 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=../..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
@@ -54,9 +54,9 @@
MDRaidTarget.o
-INCLUDE +=
-CXXFLAGS += -DPARANOIA=$(PARANOID)
-LDFLAGS += -lgroup -lmagic
+INCLUDE +=
+CXXFLAGS += -DPARANOIA=$(PARANOID)
+LDFLAGS += -lgroup -lmagic
ifeq ($(PARANOID), 1)
LDFLAGS += ${top_srcdir}/common/paranoid/*.o
@@ -68,30 +68,25 @@
*.o: *.h
-
-install:
- $(INSTALL_DIR) ${libexecdir}
- $(INSTALL_BIN) ${TARGET} ${libexecdir}
- $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
+install:
+ $(INSTALL_DIR) ${libexecdir}
+ $(INSTALL_BIN) ${TARGET} ${libexecdir}
+ $(INSTALL_DIR) ${sysconfdir}/oddjobd.conf.d
$(INSTALL_FILE) d-bus/ricci-modstorage.oddjob.conf ${sysconfdir}/oddjobd.conf.d
- $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
+ $(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
$(INSTALL_FILE) d-bus/ricci-modstorage.systembus.conf ${sysconfdir}/dbus-1/system.d
-
-uninstall:
+uninstall:
clean:
rm -f $(OBJECTS) $(TARGET)
-check:
+check:
rebuild: clean all
-
-$(TARGET): $(OBJECTS)
+$(TARGET): $(OBJECTS)
$(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS)
-
main_test: main_test.o mdadm_wrapper.o
- $(CXX) -o main_test main_test.o \
- mdadm_wrapper.o $(LDFLAGS)
+ $(CXX) -o main_test main_test.o mdadm_wrapper.o $(LDFLAGS)
--- conga/ricci/init.d/Makefile 2006/06/30 22:26:12 1.3
+++ conga/ricci/init.d/Makefile 2007/09/11 02:42:52 1.4
@@ -1,12 +1,12 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
@@ -17,14 +17,14 @@
all:
-install:
+install:
$(INSTALL_DIR) ${sysconfdir}/rc.d/init.d
$(INSTALL_BIN) ${TARGET} ${sysconfdir}/rc.d/init.d
-uninstall:
+uninstall:
clean:
-check:
+check:
rebuild: clean all
--- conga/ricci/ricci/Makefile 2007/09/11 00:26:52 1.23
+++ conga/ricci/ricci/Makefile 2007/09/11 02:42:52 1.24
@@ -1,12 +1,12 @@
-################################################################################################################################################################
+################################################################################
##
-## Copyright (C) 2005-2007 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
@@ -51,7 +51,7 @@
*.o: *.h ../include/*.h
-install:
+install:
$(INSTALL_DIR) ${sbindir}
$(INSTALL_BIN) ${TARGET} ${sbindir}
$(INSTALL_DIR) ${libexecdir}/ricci
@@ -65,18 +65,17 @@
$(INSTALL_DIR) ${sysconfdir}/dbus-1/system.d
$(INSTALL_FILE) d-bus/ricci.systembus.conf ${sysconfdir}/dbus-1/system.d
-
-uninstall:
+uninstall:
clean:
rm -f $(TARGET) $(OBJECTS)
rm -f $(TARGET_WORKER) $(TARGET_WORKER_OBJECTS)
-check:
+check:
rebuild: clean all
-$(TARGET): $(OBJECTS)
+$(TARGET): $(OBJECTS)
$(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) -lsasl2
${TARGET_WORKER}: ${TARGET_WORKER_OBJECTS}
--- conga/ricci/pam.d/Makefile 2006/06/30 22:26:13 1.3
+++ conga/ricci/pam.d/Makefile 2007/09/11 02:42:52 1.4
@@ -1,12 +1,12 @@
-################################################################################################################################################################
+################################################################################
##
-## 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.
##
-##############################################################################################################################################################
+################################################################################
top_srcdir=..
UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
@@ -15,14 +15,14 @@
all:
-install:
- $(INSTALL_DIR) ${sysconfdir}/pam.d
+install:
+ $(INSTALL_DIR) ${sysconfdir}/pam.d
$(INSTALL_FILE) ricci ${sysconfdir}/pam.d/
-uninstall:
+uninstall:
clean:
-check:
+check:
rebuild: clean all
More information about the Cluster-devel
mailing list