[libimdb-commit] CVS: libimdb/java Makefile,1.1,1.2

[Jerry V. <jve...@us...>]

Update of /cvsroot/libimdb/libimdb/java
In directory sc8-pr-cvs1:/tmp/cvs-serv12625

Modified Files:
	Makefile 
Log Message:
swig installation is option

Index: Makefile
===================================================================
RCS file: /cvsroot/libimdb/libimdb/java/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	16 Jun 2003 04:18:38 -0000	1.1
--- Makefile	21 Aug 2003 23:24:39 -0000	1.2
***************
*** 18,44 ****
  GENERATED_FILES=gen_$(BUILD_OS)/JLog_swig.c gen_$(BUILD_OS)/Parser_swig.c
  
  build: $(GENERATED_FILES)
  	$(MAKE) $(MYDYNAMIC) DYNAMIC=$(MYDYNAMIC) SRCS="$(SRCS) $(GENERATED_FILES)"
! 	mkdir -p $(BUILD_CFG)
  	$(JAVAC) -d $(BUILD_CFG) $(JAVAC_FLAGS) -sourcepath org -classpath org `find org -name \*.java`
  
  gen_$(BUILD_OS)/JLog_swig.c:
! 	mkdir -p org/libimdb/swig/gen
! 	swig -java -module JLog -Wall -I. -I../include \
  		-package org.libimdb.swig.gen \
! 		-o org/libimdb/swig/gen/JLog_swig.c JLog.swig
! 	mkdir -p gen_$(BUILD_OS)
! 	mv org/libimdb/swig/gen/JLog_swig.c gen_$(BUILD_OS)/JLog_swig.c
  
  gen_$(BUILD_OS)/Parser_swig.c:
! 	mkdir -p org/libimdb/swig/gen
! 	swig -java -module Parser -Wall -I. -I../include \
  		-package org.libimdb.swig.gen \
! 		-o org/libimdb/swig/gen/Parser_swig.c Parser.swig
! 	mkdir -p gen_$(BUILD_OS)
! 	mv org/libimdb/swig/gen/Parser_swig.c gen_$(BUILD_OS)/Parser_swig.c
  
  clobber::
! 	$(RM) -rf $(BUILD_CFG) gen_$(OS)
  	$(RM) -rf org/libimdb/swig/gen
  
--- 18,69 ----
  GENERATED_FILES=gen_$(BUILD_OS)/JLog_swig.c gen_$(BUILD_OS)/Parser_swig.c
  
+ #
+ # @todo - find way so we don't invoke javac every time in build target...
+ #
  build: $(GENERATED_FILES)
  	$(MAKE) $(MYDYNAMIC) DYNAMIC=$(MYDYNAMIC) SRCS="$(SRCS) $(GENERATED_FILES)"
! 	@[ -d $(BUILD_CFG) ] || $(MKPATH) $(BUILD_CFG)
  	$(JAVAC) -d $(BUILD_CFG) $(JAVAC_FLAGS) -sourcepath org -classpath org `find org -name \*.java`
  
  gen_$(BUILD_OS)/JLog_swig.c:
! 	@[ -d $(@D) ] || $(MKPATH) $(@D)
! 	@if [ ! -f "$(SWIG)" -a -f "gen_STATIC/$(@F)" ] ; then \
!            cp gen_STATIC/$(@F) $@; \
! 	else \
! 	   [ -d org/libimdb/swig/gen ] || $(MKPATH) org/libimdb/swig/gen ;\
! 	   $(ECHO) "generating $@..";\
! 	   swig -java -module JLog -Wall -I. -I../include \
  		-package org.libimdb.swig.gen \
! 		-o org/libimdb/swig/gen/JLog_swig.c JLog.swig ;\
! 	   mv org/libimdb/swig/gen/JLog_swig.c $(@D)/JLog_swig.c ;\
! 	   $(CMP) -s $(@D)/JLog_swig.c gen_STATIC/JLog_swig.c ;\
!            if [ "$$?" -eq "0" ] ; then \
!               $(ECHO) "generated jni wrapper: gen_STATIC/JLog_swig.c is up-to-date" ;\
!            else \
!               $(ECHO) "WARNING: $(@D)/JLog_swig.c is different from gen_STATIC/JLog_swig.c" ;\
!            fi ;\
! 	fi
  
  gen_$(BUILD_OS)/Parser_swig.c:
! 	@[ -d $(@D) ] || $(MKPATH) $(@D)
! 	@if [ ! -f "$(SWIG)" -a -f "gen_STATIC/$(@F)" ] ; then \
!            cp gen_STATIC/$(@F) $@; \
! 	else \
! 	   [ -d org/libimdb/swig/gen ] || $(MKPATH) org/libimdb/swig/gen ;\
! 	   $(ECHO) "generating $@..";\
! 	   swig -java -module Parser -Wall -I. -I../include \
  		-package org.libimdb.swig.gen \
! 		-o org/libimdb/swig/gen/Parser_swig.c Parser.swig ;\
! 	   mv org/libimdb/swig/gen/Parser_swig.c $(@D)/Parser_swig.c ;\
! 	   $(CMP) -s $(@D)/Parser_swig.c gen_STATIC/Parser_swig.c ;\
!            if [ "$$?" -eq "0" ] ; then \
!               $(ECHO) "generated jni wrapper: gen_STATIC/Parser_swig.c is up-to-date" ;\
!            else \
!               $(ECHO) "WARNING: $(@D)/Parser_swig.c is different from gen_STATIC/Parser_swig.c" ;\
!            fi ;\
! 	fi
  
  clobber::
! 	$(RM) -rf $(BUILD_CFG) gen_$(BUILD_OS)
  	$(RM) -rf org/libimdb/swig/gen