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

diff --git a/Makefile.package b/Makefile.package
index 8b0f144..6b1e4ca 100644 (file)
--- a/Makefile.package
+++ b/Makefile.package
@@ -20,48 +20,44 @@ BUILD_CMD = svn update && make clean-native all
 all: compile\r
 \r
 LIB_DIR=target/dll\r
+DLL_DIR=$(LIB_DIR)/native\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
+DLL_WIN=$(DLL_DIR)/Windows/x86/sqlitejdbc.dll\r
+DLL_MAC=$(DLL_DIR)/Mac/i386/sqlitejdbc.jnilib\r
+DLL_LINUX=$(DLL_DIR)/Linux/i368/libsqlitejdbc.so\r
+DLL_AMD64=$(DLL_DIR)/Linux/amd64/libsqlitejdbc.so\r
+LIB_PUREJAVA=$(LIB_DIR)/purejava/SQLite.class\r
 \r
+$(LIB_PUREJAVA):\r
+       ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK)/sqlitejdbc && make -f Makefile.nested"\r
+       mkdir -p $(LIB_DIR)/purejava\r
+       scp $(MAC_SERVER):./$(MAC_WORK)/sqlitejdbc/build/org/sqlite/SQLite.class $(LIB_DIR)/purejava/\r
 \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
+       mkdir -p $(DLL_DIR)/Windows\r
+       $(RSYNC)  $(WIN_SERVER):./$(WIN_WORK)/$(NATIVE_DIR)/Windows/ $(DLL_DIR)/Windows/\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
-\r
-$(DLL_PUREJAVA):\r
-       ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK)/sqlitejdbc && make -f Makefile.nested"\r
-       mkdir -p $(LIB_DIR)/purejava\r
-       scp $(MAC_SERVER):./$(MAC_WORK)/sqlitejdbc/build/org/sqlite/SQLite.class $(LIB_DIR)/purejava/\r
+       ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK) && $(BUILD_CMD)"\r
+       mkdir -p $(DLL_DIR)/Mac\r
+       $(RSYNC)  $(MAC_SERVER):./$(MAC_WORK)/$(NATIVE_DIR)/Mac/ $(DLL_DIR)/Mac/\r
 \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
+       mkdir -p $(DLL_DIR)/Linux/i386\r
+       $(RSYNC)  $(LINUX_SERVER):./$(LINUX_WORK)/$(NATIVE_DIR)/Linux/i386/ $(DLL_DIR)/Linux/i368/\r
 \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
+       mkdir -p $(DLL_DIR)/Linux/amd64\r
+       $(RSYNC)  $(AMD_SERVER):./$(AMD_WORK)/$(NATIVE_DIR)/Linux/amd64/ $(DLL_DIR)/Linux/amd64/\r
 \r
+$(DLL_DIR):\r
+       mkdir -p $@\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/x86/\r
-       cp $(DLL_MAC) $(RESOURCE_DIR)/native/Mac/i386/\r
-       cp $(DLL_LINIX) $(RESOURCE_DIR)/native/Linux/i386/\r
-       cp $(DLL_AMD64) $(RESOURCE_DIR)/native/Linux/amd64/\r
+compile: $(DLL_DIR) $(LIB_PUREJAVA) $(DLL_WIN) $(DLL_MAC) $(DLL_LINUX) $(DLL_AMD64)\r
+       cp $(LIB_PUREJAVA) $(RESOURCE_DIR)/org/sqlite\r
+       cp -r $(DLL_DIR)/ $(RESOURCE_DIR)/native/\r
 \r