From a01e95a093f77d8171bed85553dce24b19d220b3 Mon Sep 17 00:00:00 2001
From: leo <leo@ae02f08e-27ec-0310-ae8c-8ba02fe2eafd>
Date: Thu, 16 Oct 2008 04:46:44 +0000
Subject: [PATCH] git-svn-id:
 http://www.xerial.org/svn/project/XerialJ/trunk/sqlite-jdbc@2548
 ae02f08e-27ec-0310-ae8c-8ba02fe2eafd

---
 Makefile         | 38 ++++++++++++++++++++++++++++----------
 Makefile.package | 11 +++++------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 612d70c..7a9c561 100644
--- a/Makefile
+++ b/Makefile
@@ -35,31 +35,49 @@ LIBNAME   := $($(OS)_LIBNAME)
 
 .phony: all package win mac linux native deploy
 
-all: native
+all: package
 
 deploy: 
 	mvn deploy 
 
 
 OSInfoClass=org/xerial/db/sql/sqlite/OSInfo
+OSINFO_PROG=target/sqlitejdbc/$(OSInfoClass).class
+SQLITE_DLL=sqlitejdbc/build/$(target)/$(LIBNAME)
+SQLITE_BUILD_DIR=sqlitejdbc/build/$(sqlite)-$(target)
 
+LIB_FOLDER = $(shell java -cp target/sqlitejdbc org.xerial.db.sql.sqlite.OSInfo)
+WORK_DIR=target/dll/native
 
-target/sqlitejdbc/$(OSInfoClass).class:
+UPDATE_FLAG=$(WORK_DIR)/UPDATE
+
+$(OSINFO_PROG): src/main/java/$(OSInfoClass).java
 	mkdir -p target/sqlitejdbc
-	javac src/main/java/$(OSInfoClass).java -d target/sqlitejdbc
+	javac $< -d target/sqlitejdbc
 
-sqlitejdbc/build/$(target)/$(LIBNAME): 
-	cd sqlitejdbc && make native 
+$(SQLITE_DLL): $(SQLITE_BUILD_DIR)
 
-sqlitejdbc/build/$(sqlite)-$(target):
+$(SQLITE_BUILD_DIR): Makefile sqlitejdbc/Makefile 
 	cd sqlitejdbc && make native
 
-LIB_FOLDER = $(RESOURCE_DIR)/native/$(shell java -cp target/sqlitejdbc org.xerial.db.sql.sqlite.OSInfo)
+#$(NATIVE_DLL): $(OSINFO_PROG) $(SQLITE_DLL)
+#	mkdir -p $(WORK_DIR)/$(LIB_FOLDER)
+#	cp $(SQLITE_DLL) $(WORK_DIR)/$(LIB_FOLDER) 
 
 #native: sqlitejdbc/build/$(target)/$(LIBNAME) target/sqlitejdbc/$(OSInfoClass).class
-native: sqlitejdbc/build/$(sqlite)-$(target) sqlitejdbc/build/$(target)/$(LIBNAME) target/sqlitejdbc/$(OSInfoClass).class
-	mkdir -p $(LIB_FOLDER)
-	cp sqlitejdbc/build/$(target)/$(LIBNAME) $(LIB_FOLDER) 
+
+$(UPDATE_FLAG): $(OS_INFO_PROG)
+	mkdir -p $(WORK_DIR)/$(LIB_FOLDER)
+	cp $(SQLITE_DLL) $(WORK_DIR)/$(LIB_FOLDER) 
+	touch $(UPDATE_FLAG)
+
+native: $(OSINFO_PROG) $(UPDATE_FLAG)
+
+NATIVE_DLL=$(WORK_DIR)/$(LIB_FOLDER)/$(LIBNAME)
+
+package: $(OSINFO_PROG) $(UPDATE_FLAG)
+	mkdir -p $(RESOURCE_DIR)/native/$(LIB_FOLDER)
+	cp $(NATIVE_DLL) $(RESOURCE_DIR)/native/$(LIB_FOLDER)
 	mvn package
 
 clean-native:
diff --git a/Makefile.package b/Makefile.package
index 9d639a7..c76f3f9 100644
--- a/Makefile.package
+++ b/Makefile.package
@@ -14,8 +14,7 @@ LINUX_WORK=work/eclipse/xerial/sqlite-jdbc
 AMD_SERVER=utgb01
 AMD_WORK=work/eclipse/xerial/sqlite-jdbc
 
-BUILD_CMD = svn update && make clean-native all
-
+BUILD_CMD = svn update && make native
 
 all: compile
 
@@ -37,22 +36,22 @@ $(LIB_PUREJAVA):
 $(DLL_WIN): 
 	ssh $(WIN_SERVER) "source .zprofile && cd $(WIN_WORK) && $(BUILD_CMD)"
 	mkdir -p $(DLL_DIR)/Windows
-	$(RSYNC)  $(WIN_SERVER):./$(WIN_WORK)/$(NATIVE_DIR)/Windows/ $(DLL_DIR)/Windows/
+	$(RSYNC)  $(WIN_SERVER):./$(WIN_WORK)/$(DLL_DIR)/Windows/ $(DLL_DIR)/Windows/
 
 $(DLL_MAC): 
 	ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK) && $(BUILD_CMD)"
 	mkdir -p $(DLL_DIR)/Mac
-	$(RSYNC)  $(MAC_SERVER):./$(MAC_WORK)/$(NATIVE_DIR)/Mac/ $(DLL_DIR)/Mac/
+	$(RSYNC)  $(MAC_SERVER):./$(MAC_WORK)/$(DLL_DIR)/Mac/ $(DLL_DIR)/Mac/
 
 $(DLL_LINUX):
 	ssh $(LINUX_SERVER) "source .zprofile && source /etc/profile.d/java.sh && cd $(LINUX_WORK) && $(BUILD_CMD)"
 	mkdir -p $(DLL_DIR)/Linux/i386
-	$(RSYNC)  $(LINUX_SERVER):./$(LINUX_WORK)/$(NATIVE_DIR)/Linux/i386/ $(DLL_DIR)/Linux/i386/
+	$(RSYNC)  $(LINUX_SERVER):./$(LINUX_WORK)/$(DLL_DIR)/Linux/i386/ $(DLL_DIR)/Linux/i386/
 
 $(DLL_AMD64):
 	ssh $(AMD_SERVER) "source .zprofile && cd $(AMD_WORK) && $(BUILD_CMD)"
 	mkdir -p $(DLL_DIR)/Linux/amd64
-	$(RSYNC)  $(AMD_SERVER):./$(AMD_WORK)/$(NATIVE_DIR)/Linux/amd64/ $(DLL_DIR)/Linux/amd64/
+	$(RSYNC)  $(AMD_SERVER):./$(AMD_WORK)/$(DLL_DIR)/Linux/amd64/ $(DLL_DIR)/Linux/amd64/
 
 $(DLL_DIR):
 	mkdir -p $@
-- 
2.11.0