deps/zlib; eda/SQLite: Tweaks to build with Emscripten

[sdk] / deps / Makefile

diff --git a/deps/Makefile b/deps/Makefile
index 6280b01..6dcec59 100644 (file)
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -1,42 +1,50 @@
-.PHONY: freetype jpeg png gif z ffi clean realclean distclean
+.PHONY: freetype jpeg png gif z ffi cleantarget clean realclean distclean
 .SILENT:
 
-# CROSS-PLATFORM MAGIC
+_CF_DIR = ../
 
-include ../crossplatform.mk
-include ../default.cf
+include $(_CF_DIR)crossplatform.mk
+include $(_CF_DIR)default.cf
 
 ifdef WINDOWS_TARGET
 all: freetype jpeg png gif ffi z
 else
 ifdef OSX_TARGET
-all: jpeg png gif
+all: jpeg gif
 else
 all: gif
 endif
 endif
 
+cleantarget:
+       cd freetype-2.3.12 && $(MAKE) cleantarget
+       cd libpng-1.6.12 && $(MAKE) cleantarget
+       cd zlib-1.2.8 && $(MAKE) cleantarget
+       cd jpeg-9a && $(MAKE) cleantarget
+       cd libungif-4.1.1 && $(MAKE) cleantarget
+       cd libffi-3.0.11 && $(MAKE) cleantarget
+
 clean:
        cd freetype-2.3.12 && $(MAKE) clean
-       cd libpng-1.4.0 && $(MAKE) clean
-       cd zlib && $(MAKE) clean
-       cd jpeg-6b && $(MAKE) clean
+       cd libpng-1.6.12 && $(MAKE) clean
+       cd zlib-1.2.8 && $(MAKE) clean
+       cd jpeg-9a && $(MAKE) clean
        cd libungif-4.1.1 && $(MAKE) clean
        cd libffi-3.0.11 && $(MAKE) clean
 
 realclean:
        cd freetype-2.3.12 && $(MAKE) realclean
-       cd libpng-1.4.0 && $(MAKE) realclean
-       cd zlib && $(MAKE) realclean
-       cd jpeg-6b && $(MAKE) realclean
+       cd libpng-1.6.12 && $(MAKE) realclean
+       cd zlib-1.2.8 && $(MAKE) realclean
+       cd jpeg-9a && $(MAKE) realclean
        cd libungif-4.1.1 && $(MAKE) realclean
        cd libffi-3.0.11 && $(MAKE) realclean
 
 distclean:
        cd freetype-2.3.12 && $(MAKE) distclean
-       cd libpng-1.4.0 && $(MAKE) distclean
-       cd zlib && $(MAKE) distclean
-       cd jpeg-6b && $(MAKE) distclean
+       cd libpng-1.6.12 && $(MAKE) distclean
+       cd zlib-1.2.8 && $(MAKE) distclean
+       cd jpeg-9a && $(MAKE) distclean
        cd libungif-4.1.1 && $(MAKE) distclean
        cd libffi-3.0.11 && $(MAKE) distclean
 
@@ -46,11 +54,11 @@ freetype:
        
 jpeg:
        @$(call echo,Building libjpeg...)
-       cd jpeg-6b && $(MAKE)
+       cd jpeg-9a && $(MAKE)
 
 png:
        @$(call echo,Building libpng...)
-       cd libpng-1.4.0 && $(MAKE)
+       cd libpng-1.6.12 && $(MAKE)
 
 gif:
        @$(call echo,Building libungif...)
@@ -58,7 +66,7 @@ gif:
 
 z:
        @$(call echo,Building zlib...)
-       cd zlib && $(MAKE)
+       cd zlib-1.2.8 && $(MAKE)
 
 ffi:
        @$(call echo,Building libffi...)