Menu
▾
▴
[Sblim-commit] indication_helper autoconfiscate.sh,NONE,1.1 Makefile.am,1.1.1.1,1.2 README,1.1.1.1,1.2 configure.ac,1.2,1.3 sblim-indication_helper.spec.in,1.1.1.1,1.2 autoconfiscate,1.1,NONE
|
From: Viktor M. <mih...@us...> - 2005-04-07 14:55:44
|
Update of /cvsroot/sblim/indication_helper In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10321 Modified Files: Makefile.am README configure.ac sblim-indication_helper.spec.in Added Files: autoconfiscate.sh Removed Files: autoconfiscate Log Message: Bug 1177177: Cleaned up some problems with certain make targets and brought in line with other SBLIM packages. --- autoconfiscate DELETED --- Index: README =================================================================== RCS file: /cvsroot/sblim/indication_helper/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- README 2 Feb 2005 19:06:51 -0000 1.1.1.1 +++ README 7 Apr 2005 14:55:33 -0000 1.2 @@ -6,7 +6,7 @@ CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. You can obtain a current copy of the Common Public License from - http://oss.software.ibm.com/developerworks/opensource/license-cpl.html + http://www.opensource.org/licenses/cpl1.0.php Author: Konrad Rzeszutek <ko...@us...> Date : 09/20/2004 @@ -20,12 +20,15 @@ --------------------------------------------------------- The following software is required to build indication_helper -autoconf >= 2.57 -automake >= 1.5 gcc >= 3.2.0 -cmpi header files >= ver 86 (These files are located in Pegasus and OpenWBEM - WBEM implementation) +cmpi header files >= ver 86 (These files are located in Pegasus + and OpenWBEM WBEM implementation and part of the + SBLIM cmpi-devel package) +If you build from CVS you also need +autoconf >= 2.57 +automake >= 1.5 +libtool (preferably >= 1.8.5) --------------------------------------------------------- BUILD / INSTALLATION @@ -33,7 +36,7 @@ First time to extract the code: run - ./bootstrap + ./autoconfiscate.sh This will generate all files needed to compile. @@ -69,7 +72,7 @@ --------------------------------------------------------- For more information please see the project webiste at -http://www-124.ibm.com/sblim/ +http://sblim.sourceforge.net Index: configure.ac =================================================================== RCS file: /cvsroot/sblim/indication_helper/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- configure.ac 28 Mar 2005 19:15:38 -0000 1.2 +++ configure.ac 7 Apr 2005 14:55:34 -0000 1.3 @@ -2,14 +2,12 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT(sblim-indication_helper, 1.3, sbl...@ww...) -AM_INIT_AUTOMAKE(sblim-indication_helper, 1.3) +AC_INIT(SBLIM Indication Helper, 0.3, sbl...@ww...,sblim-indication_helper) +AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ind_helper.c]) AM_CONFIG_HEADER(config.h) -VERSION=1.3 IND_HLP_PKG=sblim-indication_helper -AC_SUBST(VERSION) AC_SUBST(IND_HLP_PKG) # Checks for programs. @@ -17,7 +15,6 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -AC_PROG_RANLIB AC_PROG_LIBTOOL AC_PATH_PROGS(RPM, rpmbuild) Index: Makefile.am =================================================================== RCS file: /cvsroot/sblim/indication_helper/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- Makefile.am 2 Feb 2005 19:06:51 -0000 1.1.1.1 +++ Makefile.am 7 Apr 2005 14:55:33 -0000 1.2 @@ -1,13 +1,9 @@ -MAINTAINERCLEANFILES = Makefile.in - INCLUDES = -I$(top_srcdir) -AM_CFLAGS = @CFLAGS@ - RPMREL = @RPMREL@ RPM = @RPM@ RPMFLAGS = -ta -TARFILE = $(distdir).tar.gz +TARFILE = $(PACKAGE)-$(VERSION).tar.bz2 DESTDIR = RPMDIR =$(HOME)/rpms @@ -18,37 +14,13 @@ lib_LTLIBRARIES = libind_helper.la SUBDIRS = test -libind_helper_la_SOURCES = ind_helper.c +libind_helper_la_SOURCES = ind_helper.c libind_helper_la_LDFLAGS = @LIBPTHREAD@ include_HEADERS = $(top_srcdir)/ind_helper.h -EXTRA_DIST = $(shell find -name '*.h') \ - sblim-indication_helper.spec \ - examples/snmptrapd/test/CreateFilter01.rspgood \ - examples/snmptrapd/test/CreateFilter01.xml \ - examples/snmptrapd/test/CreateHandler01.rspgood \ - examples/snmptrapd/test/CreateHandler01.xml \ - examples/snmptrapd/test/CreateSubscription01.rspgood \ - examples/snmptrapd/test/CreateSubscription01.xml \ - examples/snmptrapd/test/DeleteFilter01.rspgood \ - examples/snmptrapd/test/DeleteFilter01.xml \ - examples/snmptrapd/test/DeleteHandler01.xml \ - examples/snmptrapd/test/DeleteSubscription01.xml \ - examples/snmptrapd/test/Makefile \ - examples/snmptrapd/test/NOTIFICATION-TEST-MIB.txt \ - examples/snmptrapd/test/result.rspgood \ - examples/snmptrapd/CIM_Event.mof \ - examples/snmptrapd/CIM_NetSNMPTrapIndication.mof \ - examples/snmptrapd/CMPI_data.c \ - examples/snmptrapd/CMPI_data.h \ - examples/snmptrapd/Makefile \ - examples/snmptrapd/Registration.mof \ - examples/snmptrapd/SNMP_data.c \ - examples/snmptrapd/SNMP_data.h \ - examples/snmptrapd/SNMPtoCIMProvider.c - +EXTRA_DIST = sblim-indication_helper.spec -rpm: dist +rpm: dist-bzip2 $(RPM) $(RPMFLAGS) $(TARFILE); --- NEW FILE: autoconfiscate.sh --- #!/bin/sh # # Script to setup autoconf/automake build environment. # Run this first to create the configure script # NO CHANGES SHOULD BE NECESSARY TO THIS FILE aclocal --force && autoheader --force && libtoolize --force && automake --add-missing --force-missing && autoconf --force && echo "You may now run ./configure" Index: sblim-indication_helper.spec.in =================================================================== RCS file: /cvsroot/sblim/indication_helper/sblim-indication_helper.spec.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- sblim-indication_helper.spec.in 2 Feb 2005 19:06:51 -0000 1.1.1.1 +++ sblim-indication_helper.spec.in 7 Apr 2005 14:55:34 -0000 1.2 @@ -11,22 +11,18 @@ # Author: Konrad Rzeszutek <ko...@us...> # Date : 09/20/2004 # -%define prefix /usr -Name: @IND_HLP_PKG@ -Summary: @IND_HLP_PKG@ - Indication helper library for CMPI providers +Name: @PACKAGE@ +Summary: @PACKAGE@ - Indication helper library for CMPI providers Version: @VERSION@ Release: 1 -Copyright: Common Public Licence http://oss.software.ibm.com/developerworks/opensource/license-cpl.html +Copyright: Common Public Licence 1.0 Group: System Management/Libraries Vendor: SBLIM Packager: Konrad Rzeszutek <ko...@us...> -Source: @IND_HLP_PKG@-@VERSION@.tar.gz -Buildroot: /var/tmp/@IND_HLP_PKG@-root -Summary: Library that provides SAForum's HPI -Group: Utilities -AutoReq: yes -Requires: libc.so.6 libpthread.so.0 +Source: @PACKAGE@-@VERSION@.tar.bz2 +Buildroot: /var/tmp/@PACKAGE@-root + %description This package contain developer library for helping out when writing CMPI providers. This library @@ -44,10 +40,10 @@ ################################################### %build ################################################### -./configure @ac_configure_args@ \ - --prefix=%{prefix} +%configure + make -make test + ################################################### %install ################################################### @@ -65,7 +61,6 @@ ################################################### %defattr(-,root,root) %doc README COPYING ChangeLog TODO -%doc examples/ %{_includedir} %{_libdir}/lib* @@ -77,5 +72,5 @@ then rm -rf $RPM_BUILD_ROOT fi -rm -rf $RPM_BUILD_DIR/@IND_HLP_PKG@-@VERSION@ +rm -rf $RPM_BUILD_DIR/@PACKAGE@-@VERSION@ |
