[Linux-ha-dev] [patch 02/12] build: Dont distribute cim_provider

[Simon Horman]

As configure.in currently stands, as of the hg dev tree 54723736ab18,
make dist fails because autogenerated files in cim/, in
parcicular cim/Makefile.am, are not created.

Andrew Beekhof tells me that this is because cim_provider can't build
without the crm, which is now in the pacemaker tree along with
cim_provider.

This fairly minimal patch allows make dist to succeed by not
distributing cim/. I have found that building the resulting
tarball also succeeds.

A fuller patch would either fix cim_provider so that it can compile,
or remove it completely from cim_provider/, configure.in and
heartbeat.rpm.spec. I don't feel that it is within my jurisdiction
to make either change at this time.

Signed-off-by: Simon Horman <horms at verge.net.au>

Index: hertbeat-strip/Makefile.am
===================================================================
--- hertbeat-strip.orig/Makefile.am	2008-03-28 11:02:41.000000000 +0900
+++ hertbeat-strip/Makefile.am	2008-03-28 11:19:27.000000000 +0900
@@ -55,10 +55,6 @@ hauser = 		@HA_CCMUSER@
 
 ## proc-ha is left out from SUBDIRS (completely obsolete)
 
-if CIM_PROVIDER_BUILD
-CIM_PROVIDER_DIR = cim
-endif
-
 if TSA_PLUGIN_BUILD
 TSA_PLUGIN_DIR = tsa_plugin
 endif
@@ -71,7 +67,7 @@ endif
 SUBDIRS	= buildtools $(LIBLTDL_DIR) debian pkg port replace include lib	\
           heartbeat membership telecom resources lrm $(CRM_DIR)		\
           fencing logd tools doc cts $(MGMT_DIR)   \
-          $(CIM_PROVIDER_DIR) $(LDIRECTORD_DIR) config $(TSA_PLUGIN_DIR) contrib 
+          $(LDIRECTORD_DIR) config $(TSA_PLUGIN_DIR) contrib
 
 HANDY_DOCS = doc/ChangeLog doc/GettingStarted.html doc/DirectoryMap.txt
 HBDOCS = doc/heartbeat_api.html

-- 

-- 
Horms