SimDist/packages/lcio

diff -u -r1.14 -r1.15
--- Makefile.in	14 Jul 2010 18:00:00 -0000	1.14
+++ Makefile.in	20 Jul 2010 22:01:49 -0000	1.15
@@ -1,29 +1,28 @@

-# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.14 2010/07/14 18:00:00 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.15 2010/07/20 22:01:49 jeremy Exp $

 # default
 
 # package build
 include ../../build/package.gmk
 

+compile_ant:
+	export PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" ; cd $(PACKAGE_BUILDDIR) ; ant aid.generate cpp; 
+
+
+install_sio_lib:
+	cp $(PACKAGE_BUILDDIR)/sio/lib/libsio.a $(PACKAGE_BUILDDIR)/lib;
+
+compile_cmake:
+	cd $(PACKAGE_BUILDDIR); mkdir build; cd build; $(CMAKE) -DBUILD_SHARED_LIBS=OFF ..; $(MAKE);
+
+

 targets := cvs config
 

-# optional cmake build for mokka
-#ifdef CMAKE
-#	targets += compile_cmake
-#endif
-
-#all: cvs config compile_ant
-
-all: cvs config compile
-
-# 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

+ifdef CMAKE
+targets += compile_cmake
+else
+targets += compile_ant install_sio_lib
+endif
+
+.PHONY: all
+.DUMMY: all
+all: $(targets)