From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 26 May 2012 11:52:23 +0000 (+0200)
Subject: updated cross compilation makefile.
X-Git-Tag: gnutls_3_0_21~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5c539c07bc60fcbb7748cac68fc3eebb63866e5;p=thirdparty%2Fgnutls.git

updated cross compilation makefile.
---

diff --git a/cross.mk b/cross.mk
index 8161b09ba2..08f20dc31d 100644
--- a/cross.mk
+++ b/cross.mk
@@ -27,12 +27,11 @@ $(GNUTLS_DIR)-w32.zip: $(LIB_DIR) $(BIN_DIR) $(GNUTLS_DIR)/.installed
 	cd $(CROSS_DIR) && zip -r $(PWD)/$@ *
 	gpg --sign --detach $(GNUTLS_DIR)-w32.zip
 
-gnutls-$(GNUTLS_VERSION)-1gn.DevPak: $(GNUTLS_DIR)-w32.zip
+gnutls-$(GNUTLS_VERSION)-1gn.DevPak: $(GNUTLS_DIR)-w32.zip devcpp.tar
 	rm -rf $(DEVCPP_DIR)
-	mkdir -p $(DEVCPP_DIR)/gnutls
-	mkdir -p $(DEVCPP_DIR)/MinGW32
-	cd $(DEVCPP_DIR)/gnutls && unzip ../../$(GNUTLS_DIR)-w32.zip 
-	cd $(DEVCPP_DIR) && tar xf ../../devcpp.tar && sed -i 's/@VERSION@/$(GNUTLS_VERSION)/g' gnutls.DevPackage
+	mkdir -p $(DEVCPP_DIR)
+	cd $(DEVCPP_DIR) && unzip ../$(GNUTLS_DIR)-w32.zip 
+	cd $(DEVCPP_DIR) && tar xf ../devcpp.tar && sed -i 's/@VERSION@/$(GNUTLS_VERSION)/g' gnutls.DevPackage
 	cd $(DEVCPP_DIR) && tar -cjf ../$@ .
 
 devpak: gnutls-$(GNUTLS_VERSION)-1gn.DevPak
diff --git a/win32/.gitignore b/win32/.gitignore
new file mode 100644
index 0000000000..692ff23589
--- /dev/null
+++ b/win32/.gitignore
@@ -0,0 +1,10 @@
+*.tar.*
+*.zip
+*.sig
+*.DevPak
+gnutls-*
+nettle-*
+gmp-*
+p11-kit-*
+devcpp
+win32
diff --git a/win32/devcpp.tar b/win32/devcpp.tar
index f3a48d820a..d8ba064fe8 100644
Binary files a/win32/devcpp.tar and b/win32/devcpp.tar differ