git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/sqlite-jdbc@2543 ae02f08e...

diff --git a/Makefile.package b/Makefile.package
index ec81b5a..ec80624 100644 (file)
--- a/Makefile.package
+++ b/Makefile.package
@@ -14,28 +14,53 @@ LINUX_WORK=work/eclipse/xerial/sqlite-jdbc
 AMD_SERVER=utgb01\r
 AMD_WORK=work/eclipse/xerial/sqlite-jdbc\r
 \r
-BUILD_CMD = svn update && make\r
+BUILD_CMD = svn update && make clean-native all\r
 \r
-all: purejava win mac linux linux-amd\r
+.phony: compile\r
 \r
-purejava:\r
+all: compile\r
+\r
+LIB_DIR=target/dll\r
+\r
+DLL_WIN = $(LIB_DIR)/win/sqlitejdbc.dll\r
+DLL_MAC = $(LIB_DIR)/mac/libsqlitejdbc.jnilib\r
+DLL_LINUX = $(LIB_DIR)/linux/libsqlitejdbc.so\r
+DLL_AMD64 = $(LIB_DIR)/amd64/libsqlitejdbc.so\r
+DLL_PUREJAVA = $(LIB_DIR)/purejava/SQLite.class\r
+\r
+\r
+compile: $(DLL_PUREJAVA) $(DLL_WIN) $(DLL_MAC) $(DLL_LINUX) $(DLL_AMD64)\r
+       cp $(DLL_PUREJAVA) $(RESOURCE_DIR)/org/sqlite\r
+       cp $(DLL_WIN) $(RESOURCE_DIR)/native/Windows/\r
+       cp $(DLL_MAC) $(RESOURCE_DIR)/native/Mac/\r
+       cp $(DLL_LINIX) $(RESOURCE_DIR)/native/Linux/i386/\r
+       cp $(DLL_AMD64) $(RESOURCE_DIR)/native/Linux/amd64/\r
+\r
+$(DLL_WIN): \r
+       ssh $(WIN_SERVER) "source .zprofile && cd $(WIN_WORK) && $(BUILD_CMD)"\r
+       mkdir -p $(LIB_DIR)/win\r
+       $(RSYNC)  $(WIN_SERVER):./$(WIN_WORK)/$(NATIVE_DIR)/Windows/ $(LIB_DIR)/win/\r
+\r
+$(DLL_MAC):\r
+       ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK) && $(BUILD_CMD)"\r
+    mkdir -p $(LIB_DIR)/mac\r
+       $(RSYNC)  $(MAC_SERVER):./$(MAC_WORK)/$(NATIVE_DIR)/Mac/ $(LIB_DIR)/mac/\r
+\r
+$(DLL_PUREJAVA):\r
        ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK)/sqlitejdbc && make -f Makefile.nested"\r
-       mkdir -p $(RESOURCE_DIR)/org/sqlite\r
-       scp $(MAC_SERVER):./$(MAC_WORK)/sqlitejdbc/build/org/sqlite/SQLite.class $(RESOURCE_DIR)/org/sqlite/\r
+       mkdir -p $(LIB_DIR)/purejava\r
+       scp $(MAC_SERVER):./$(MAC_WORK)/sqlitejdbc/build/org/sqlite/SQLite.class $(LIB_DIR)/purejava/\r
+#      mkdir -p $(RESOURCE_DIR)/org/sqlite     \r
 \r
-win:\r
-       ssh $(WIN_SERVER) "source .zprofile && cd $(WIN_WORK) && svn update && make clean-native all" \r
-       $(RSYNC)  $(WIN_SERVER):./$(WIN_WORK)/$(NATIVE_DIR)/Windows/ $(NATIVE_DIR)/Windows/\r
+$(DLL_LINUX):\r
+       ssh $(LINUX_SERVER) "source .zprofile && source /etc/profile.d/java.sh && cd $(LINUX_WORK) && $(BUILD_CMD)"\r
+       mkdir -p $(LIB_DIR)/linux\r
+       $(RSYNC)  $(LINUX_SERVER):./$(LINUX_WORK)/$(NATIVE_DIR)/Linux/i386/ $(LIB_DIR)/linux/\r
 \r
-mac:   \r
-       ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK) && svn update && make clean-native all" \r
-       $(RSYNC)  $(MAC_SERVER):./$(MAC_WORK)/$(NATIVE_DIR)/Mac/ $(NATIVE_DIR)/Mac/\r
+$(DLL_AMD64):\r
+       ssh $(AMD_SERVER) "source .zprofile && cd $(AMD_WORK) && $(BUILD_CMD)"\r
+       mkdir -p $(LIB_DIR)/amd64\r
+       $(RSYNC)  $(AMD_SERVER):./$(AMD_WORK)/$(NATIVE_DIR)/Linux/amd64/ $(LIB_DIR)/amd64\r
 \r
-linux:         \r
-       ssh $(LINUX_SERVER) "source .zprofile && source /etc/profile.d/java.sh && cd $(LINUX_WORK) && svn update && make clean-native all" \r
-       $(RSYNC)  $(LINUX_SERVER):./$(LINUX_WORK)/$(NATIVE_DIR)/Linux/i386/ $(NATIVE_DIR)/Linux/i386/\r
 \r
-linux-amd:     \r
-       ssh $(AMD_SERVER) "source .zprofile && cd $(AMD_WORK) && svn update && make clean-native all" \r
-       $(RSYNC)  $(AMD_SERVER):./$(AMD_WORK)/$(NATIVE_DIR)/Linux/amd64/ $(NATIVE_DIR)/Linux/amd64/\r
 \r