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

---
 Makefile.package | 52 ++++++++++++++++++++++++----------------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

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