update makefile

git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/sqlite-jdbc@2544 ae02f08e-27ec-0310-ae8c-8ba02fe2eafd

diff --git a/Makefile.package b/Makefile.package
index ec80624..8b0f144 100644 (file)
--- a/Makefile.package
+++ b/Makefile.package
@@ -16,41 +16,35 @@ AMD_WORK=work/eclipse/xerial/sqlite-jdbc
 \r
 BUILD_CMD = svn update && make clean-native all\r
 \r
-.phony: compile\r
 \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
+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
+\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
-#      mkdir -p $(RESOURCE_DIR)/org/sqlite     \r
 \r
 $(DLL_LINUX):\r
        ssh $(LINUX_SERVER) "source .zprofile && source /etc/profile.d/java.sh && cd $(LINUX_WORK) && $(BUILD_CMD)"\r
@@ -64,3 +58,10 @@ $(DLL_AMD64):
 \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/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
+\r