From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 18 Sep 2007 21:21:53 -0000 Subject: [Cluster-devel] conga luci/conga_ssl/setup.py ricci/modules/cl ... Message-ID: <20070918212153.32174.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: rmccabe at sourceware.org 2007-09-18 21:21:52 Modified files: luci/conga_ssl : setup.py ricci/modules/cluster/clumon: Makefile ricci/modules/cluster/clumon/src: Makefile ricci/modules/cluster/clumon/src/cim-provider: Makefile Log message: Makefile cleanup: replace 'cd X && ${MAKE} all' with '${MAKE} -C X all' Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/conga_ssl/setup.py.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/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.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 --- conga/luci/conga_ssl/setup.py 2007/09/11 16:04:32 1.3 +++ conga/luci/conga_ssl/setup.py 2007/09/18 21:21:52 1.4 @@ -1,38 +1,31 @@ - from distutils.core import setup, Extension - module1 = Extension('conga_ssl_lib', - define_macros = [('MAJOR_VERSION', '0'), - ('MINOR_VERSION', '8')], - include_dirs = ['../../ricci/include', - '/usr/include/libxml2'], - libraries = ['ssl', 'xml2'], - #library_dirs = ['/usr/local/lib'], - sources = ['conga_ssl_lib.cpp', - 'SSLClient.cpp', - '../../ricci/common/ClientSocket.cpp', - '../../ricci/common/Socket.cpp', - '../../ricci/common/Network.cpp', - '../../ricci/common/Logger.cpp', - '../../ricci/common/Time.cpp', - '../../ricci/common/File.cpp', - '../../ricci/common/XML.cpp', - '../../ricci/common/utils.cpp', - '../../ricci/common/executils.cpp']) - - + define_macros = [('MAJOR_VERSION', '0'), ('MINOR_VERSION', '10')], + include_dirs = ['../../ricci/include', '/usr/include/libxml2'], + libraries = ['ssl', 'xml2'], + sources = [ + 'conga_ssl_lib.cpp', + 'SSLClient.cpp', + '../../ricci/common/ClientSocket.cpp', + '../../ricci/common/Socket.cpp', + '../../ricci/common/Network.cpp', + '../../ricci/common/Logger.cpp', + '../../ricci/common/Time.cpp', + '../../ricci/common/File.cpp', + '../../ricci/common/XML.cpp', + '../../ricci/common/utils.cpp', + '../../ricci/common/executils.cpp']) setup (name = 'conga_ssl_lib', - version = '0.8', - description = 'SSL Python bindings for Conga', - author = 'Stanko Kupcevic', - author_email = 'kupcevic at redhat.com', - copyright = 'Red Hat, Inc.', - license = 'GPL', - url = 'http://www.sourceware.org/cluster/conga', - long_description = ''' - conga_ssl_lib - ''', - ext_modules = [module1]) - + version = '0.10', + description = 'SSL Python bindings for Conga', + author = 'Stanko Kupcevic', + author_email = 'kupcevic at redhat.com', + copyright = 'Red Hat, Inc.', + license = 'GPL', + url = 'http://www.sourceware.org/cluster/conga', + long_description = ''' + conga_ssl_lib + ''', + ext_modules = [module1]) --- conga/ricci/modules/cluster/clumon/Makefile 2007/09/11 02:42:51 1.5 +++ conga/ricci/modules/cluster/clumon/Makefile 2007/09/18 21:21:52 1.6 @@ -14,16 +14,17 @@ 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 + ${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/ @@ -33,7 +34,8 @@ $(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 + + # cim $(INSTALL_DIR) ${docdir}/cluster-cim-${VERSION} $(INSTALL_FILE) README ${docdir}/cluster-cim-${VERSION}/ $(INSTALL_FILE) README.cim ${docdir}/cluster-cim-${VERSION}/ @@ -42,9 +44,9 @@ $(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/ @@ -52,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/src/Makefile 2007/09/11 02:42:50 1.3 +++ conga/ricci/modules/cluster/clumon/src/Makefile 2007/09/18 21:21:52 1.4 @@ -9,35 +9,35 @@ ################################################################################ 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 --- conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile 2007/09/11 02:42:50 1.6 +++ conga/ricci/modules/cluster/clumon/src/cim-provider/Makefile 2007/09/18 21:21:52 1.7 @@ -13,7 +13,6 @@ include ${top_srcdir}/make/defines.mk - ifeq ($(PEGASUS_PLATFORM),i386) PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_IX86_GNU endif