SimDist/packages/lcio
diff -u -r1.13 -r1.14
--- Makefile.in 5 Aug 2008 18:49:21 -0000 1.13
+++ Makefile.in 14 Jul 2010 18:00:00 -0000 1.14
@@ -1,25 +1,29 @@
-# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.13 2008/08/05 18:49:21 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.14 2010/07/14 18:00:00 jeremy Exp $
# default
+# package build
+include ../../build/package.gmk
+
targets := cvs config
# optional cmake build for mokka
-ifdef CMAKE
- targets += compile_cmake
-endif
+#ifdef CMAKE
+# targets += compile_cmake
+#endif
-all: cvs config compile_ant
+#all: cvs config compile_ant
-# ant compile
-.PHONY: compile_ant
-compile_ant:
- PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" ; cd $(PACKAGE_BUILDDIR) ; ant aid.generate cpp;:
-
-compile_cmake:
- cd $(PACKAGE_BUILDDIR); \
- rm BuildSetup.cmake; touch BuildSetup.cmake; \
- $(CMAKE) -DBUILD_SHARED_LIBS=OFF -DJAVA_HOME=$(JAVA_HOME) -DJDK_HOME=$(JDK_HOME) -DJAVA_BIN_PATH=$(JDK_HOME)/bin .; \
- mkdir build; cd build; $(CMAKE) -C ../BuildSetup.cmake ..; cd ..; $(MAKE) install
+all: cvs config compile
-# package build
-include ../../build/package.gmk
+# ant compile
+#.PHONY: compile_ant
+#compile_ant:
+# PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" ; cd $(PACKAGE_BUILDDIR) ; ant aid.generate cpp;:
+
+compile:
+ cd $(PACKAGE_BUILDDIR); $(CMAKE) -DBUILD_SHARED_LIBS=OFF .; $(MAKE);
+
+# cd $(PACKAGE_BUILDDIR); \
+# rm BuildSetup.cmake; touch BuildSetup.cmake; \
+# $(CMAKE) -DBUILD_SHARED_LIBS=OFF -DJAVA_HOME=$(JAVA_HOME) -DJDK_HOME=$(JDK_HOME) -DJAVA_BIN_PATH=$(JDK_HOME)/bin .; \
+# mkdir build; cd build; $(CMAKE) -C ../BuildSetup.cmake ..; cd ..; $(MAKE) install