Print

Print


Commit in SimDist/packages/lcio on MAIN
Makefile.in+8-41.9 -> 1.10
JM: more updates to cmake build

SimDist/packages/lcio
Makefile.in 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- Makefile.in	23 May 2008 20:54:09 -0000	1.9
+++ Makefile.in	23 May 2008 21:05:34 -0000	1.10
@@ -1,7 +1,11 @@
-# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.9 2008/05/23 20:54:09 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.10 2008/05/23 21:05:34 jeremy Exp $
 # default
 
-targets := cvs config compile_ant
+targets := cvs config
+
+ifdef ANT
+	targets += compile_ant
+endif
 
 ifdef CMAKE
 	targets += compile_cmake
@@ -12,10 +16,10 @@
 # ant compile
 .PHONY: compile_ant
 compile_ant:
-	PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" ; cd $(PACKAGE_BUILDDIR) ; ant aid.generate cpp;:
+	PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" ; cd $(PACKAGE_BUILDDIR) ; $(ANT) aid.generate cpp;:
 
 compile_cmake:
-	cd $(PACKAGE_BUILDDIR); $(CMAKE) .; mkdir build; cd build; $(CMAKE) -C ../BuildSetup.cmake ..; cd ..; $(MAKE) install
+	cd $(PACKAGE_BUILDDIR); $(CMAKE) -DBUILD_SHARED_LIBS=OFF .; mkdir build; cd build; $(CMAKE) -C ../BuildSetup.cmake ..; cd ..; $(MAKE) install
 
 # package build
 include ../../build/package.gmk
CVSspam 0.2.8