omc-commit

[Omc-commit] SF.net SVN: omc: [420] clp/trunk

[<np...@us...>]

Revision: 420
          http://svn.sourceforge.net/omc/?rev=420&view=rev
Author:   npaxton
Date:     2006-12-11 15:33:10 -0800 (Mon, 11 Dec 2006)

Log Message:
-----------
some fixes to spec and Makefile to help find config files, etc

Modified Paths:
--------------
    clp/trunk/configure.ac
    clp/trunk/src/Makefile.am
    clp/trunk/src/spec/omcclp.spec

Modified: clp/trunk/configure.ac
===================================================================
--- clp/trunk/configure.ac	2006-12-08 23:08:19 UTC (rev 419)
+++ clp/trunk/configure.ac	2006-12-11 23:33:10 UTC (rev 420)
@@ -2,7 +2,7 @@
 AC_CONFIG_AUX_DIR(config)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(omcclp, 0.5)
+AM_INIT_AUTOMAKE(omcclp, 0.7)
 
 AC_LANG_CPLUSPLUS
 AC_PROG_CXX

Modified: clp/trunk/src/Makefile.am
===================================================================
--- clp/trunk/src/Makefile.am	2006-12-08 23:08:19 UTC (rev 419)
+++ clp/trunk/src/Makefile.am	2006-12-11 23:33:10 UTC (rev 420)
@@ -95,12 +95,13 @@
 	stlini.cpp stlini.h \
 	version.h 
 
-dist_omcclp_DATA = omcclpd.conf omcclpaddr.ini oemextensions.ini omcclphelp.ini 
-dist_omcclpd_DATA = omcclpd.conf omcclpaddr.ini oemextensions.ini
-dist_omcclpc_DATA = omcclpd.conf omcclpaddr.ini oemextensions.ini omcclphelp.ini
-omcclpdir = $(sysconfdir)/omcclp
-omcclpddir = $(sysconfdir)/omcclpd
-omcclpcdir = $(sysconfdir)/omcclpc
+dist_omcclp_DATA = omcclpaddr.ini oemextensions.ini omcclphelp.ini omcclpd.conf	
+#dist_omcclp_DATA = omcclpd.conf omcclpaddr.ini oemextensions.ini omcclphelp.ini 
+#dist_omcclpd_DATA = omcclpd.conf omcclpaddr.ini oemextensions.ini
+#dist_omcclpc_DATA = omcclpd.conf omcclpaddr.ini oemextensions.ini omcclphelp.ini
+omcclpdir = $(sysconfdir)
+#omcclpddir = $(sysconfdir)
+#omcclpcdir = $(sysconfdir)
 
 # set the include path found by configure
 INCLUDES= $(all_includes) \

Modified: clp/trunk/src/spec/omcclp.spec
===================================================================
--- clp/trunk/src/spec/omcclp.spec	2006-12-08 23:08:19 UTC (rev 419)
+++ clp/trunk/src/spec/omcclp.spec	2006-12-11 23:33:10 UTC (rev 420)
@@ -1,11 +1,12 @@
 Summary: Implementation of the SMCLP specification
-Name: smclp
+Name: omcclp
 BuildRequires:  gcc-c++ openwbem-devel openssl-devel readline-devel
-Version: 0.1
+Version: 0.7
 Release: 1
-Copyright: Novell Inc. 
+#Copyright: Novell Inc. 
+License: Novell, Inc.
 Group: SMASH Applications
-Source: omcclp-0.1.tar.gz
+Source: omcclp-0.7.tar.gz
 URL: https://svn.innerweb.novell.com/svn/novlclp/trunk/omcclp
 Distribution: SUSE Linux
 Packager: Brad Nicholes <bni...@no...>
@@ -17,18 +18,26 @@
 %setup 
 
 %build
-./configure --prefix=/usr --sysconfdir=/etc
+./configure --prefix=/usr --sysconfdir=/etc/omcclp --enable-debug-mode
 make
 
 %install
 make install
+install /etc/omcclp/omcclpd.conf $BUILD_ROOT_DIR/etc/omcclp/omcclpc.conf
+install /etc/omcclp/omcclpd.conf $BUILD_ROOT_DIR/etc/omcclp/omcclp.conf
 
 %files
 %dir /etc/omcclp
 %config /etc/omcclp/omcclp.conf
+%config /etc/omcclp/omcclpc.conf
+%config /etc/omcclp/omcclpd.conf
 %config /etc/omcclp/omcclpaddr.ini
+%config /etc/omcclp/oemextensions.ini
+%config /etc/omcclp/omcclphelp.ini
+
 /usr/bin/omcclp
+/usr/bin/omcclpc
+/usr/sbin/omcclpd
 
 
 
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [464] clp/trunk

[<bni...@us...>]

Revision: 464
          http://svn.sourceforge.net/omc/?rev=464&view=rev
Author:   bnicholes
Date:     2007-05-21 14:53:25 -0700 (Mon, 21 May 2007)

Log Message:
-----------
Add switches to enable or disable the various binaries that are produced during the make.  Submitted by: [Jeff McMenomey <jeff mcmenomey hp com>]

Modified Paths:
--------------
    clp/trunk/configure.ac
    clp/trunk/src/Makefile.am

Modified: clp/trunk/configure.ac
===================================================================
--- clp/trunk/configure.ac	2007-05-21 21:47:29 UTC (rev 463)
+++ clp/trunk/configure.ac	2007-05-21 21:53:25 UTC (rev 464)
@@ -32,6 +32,24 @@
 OPT_FLAGS="  -DNDEBUG -O2"      # Additional optimization flags.
 
 #######################################################################
+# Allow the user to specify which pieces of OMC to build:
+# omcclp, omcclpc, omcclpd
+AC_ARG_ENABLE([omcclpcomb], 
+[  --disable-omcclpcomb    Disable the combined client/daemon build (omcclp)],
+[omcclpcomb=false],[omcclpcomb=true])
+AM_CONDITIONAL([OMCCLPCOMB], [test x$omcclpcomb = xtrue])
+
+AC_ARG_ENABLE([omcclpc], 
+[  --disable-omcclpc       Disable the client build (omcclpc)],
+[ omcclpc=false],[omcclpc=true])
+AM_CONDITIONAL([OMCCLPC], [test x$omcclpc = xtrue])
+
+AC_ARG_ENABLE([omcclpd], 
+[  --disable-omcclpd       Disable the daemon build (omcclpd)],
+[ omcclpd=false],[omcclpd=true])
+AM_CONDITIONAL([OMCCLPD], [test x$omcclpd = xtrue])
+
+#######################################################################
 # Set the debug flag if specified
 AC_ARG_ENABLE(debug-mode,
 [--enable-debug-mode Enable debugging mode],

Modified: clp/trunk/src/Makefile.am
===================================================================
--- clp/trunk/src/Makefile.am	2007-05-21 21:47:29 UTC (rev 463)
+++ clp/trunk/src/Makefile.am	2007-05-21 21:53:25 UTC (rev 464)
@@ -1,8 +1,19 @@
 SUBDIRS = clpaddrgram clpcmdgram
 
 
-bin_PROGRAMS = omcclp omcclpc
+OMCBINS = 
+
+if OMCCLPCOMB
+OMCBINS += omcclp
+endif
+if OMCCLPC
+OMCBINS += omcclpc
+endif
+
+bin_PROGRAMS = $(OMCBINS)
+if OMCCLPD
 sbin_PROGRAMS = omcclpd
+endif
 
 omcclp_SOURCES = \
 	omcclp.cpp omcclp.h \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.