From 2f6490b9dd211086e3f9241c6fd9d7040020b07f Mon Sep 17 00:00:00 2001
From: leo <leo@ae02f08e-27ec-0310-ae8c-8ba02fe2eafd>
Date: Thu, 16 Oct 2008 03:36:31 +0000
Subject: [PATCH] update makefile

git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/sqlite-jdbc@2544 ae02f08e-27ec-0310-ae8c-8ba02fe2eafd
---
 Makefile.package | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

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