rsvglibs: adjusted makefiles to build external rsvglib dependencies

9 files changed, 25 insertions, 5 deletions

diff --git a/fontconfig/makefile.mk b/fontconfig/makefile.mk
index 8fd9efe4871a..3618cdc129e8 100644
--- a/fontconfig/makefile.mk
+++ b/fontconfig/makefile.mk
@@ -45,6 +45,8 @@ all:
 TARFILE_NAME=fontconfig-2.8.0
 TARFILE_MD5=77e15a92006ddc2adbb06f840d591c0e
 
+.IF "$(OS)"=="WNT"
+
 CONFIGURE_DIR=
 .IF "$(OS)"=="WNT"
 ADDITIONAL_FILES=\
@@ -67,6 +69,8 @@ CONFIGURE_ACTION=./configure --enable-shared=yes --enable-libxml2 --disable-docs
 BUILD_ACTION=$(GNUMAKE)
 .ENDIF
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
diff --git a/freetype/makefile.mk b/freetype/makefile.mk
index a4e085471be9..c32b7dec06c6 100644
--- a/freetype/makefile.mk
+++ b/freetype/makefile.mk
@@ -45,6 +45,8 @@ all:
 TARFILE_NAME=freetype-2.4.4
 TARFILE_MD5=9273efacffb683483e58a9e113efae9f
 
+.IF "$(OS)"=="WNT"
+
 CONFIGURE_DIR=
 .IF "$(OS)"=="WNT"
 CONFIGURE_ACTION=
@@ -59,6 +61,8 @@ CONFIGURE_ACTION=.$/configure
 
 BUILD_ACTION=$(GNUMAKE)
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
diff --git a/gdk-pixbuf/prj/build.lst b/gdk-pixbuf/prj/build.lst
index 1f9de3ec47d1..1182d1bf6d19 100644
--- a/gdk-pixbuf/prj/build.lst
+++ b/gdk-pixbuf/prj/build.lst
@@ -1,3 +1,3 @@
-gp	gdk-pixbuf	: glib libjpeg libpng soltools NULL
+gp	gdk-pixbuf	: glib jpeg libpng soltools NULL
 gp	gdk-pixbuf			    usr1	-	all	gp_mkout NULL
 gp	gdk-pixbuf			    nmake	-	all	gp_gdk-pixbuf NULL
diff --git a/jpeg/prj/d.lst b/jpeg/prj/d.lst
index 237883b36951..93c3de45c570 100644
--- a/jpeg/prj/d.lst
+++ b/jpeg/prj/d.lst
@@ -1,7 +1,9 @@
 mkdir: %_DEST%\inc%_EXT%\external
 mkdir: %_DEST%\inc%_EXT%\external\jpeg
 
+..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeglib.lib
 ..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeg.lib
+..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeglib.a
 ..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeg.a
 
 ..\%__SRC%\inc\jerror.h %_DEST%\inc%_EXT%\external\jpeg\jerror.h
diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk
index 7ffb7e64f3cc..fc2897deaec1 100755
--- a/libgsf/makefile.mk
+++ b/libgsf/makefile.mk
@@ -25,7 +25,6 @@
 #
 #*************************************************************************
 
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="WNT"
 
 PRJ=.
 
@@ -49,6 +48,8 @@ LIBGSFVERSION=1.14.19
 TARFILE_NAME=$(PRJNAME)-$(LIBGSFVERSION)
 TARFILE_MD5=3a84ac2da37cae5bf7ce616228c6fbde
 
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="WNT"
+
 .IF "$(OS)" == "WNT"
 PATCH_FILES=libgsf-1.14.19.windows.patch
 
@@ -145,11 +146,12 @@ OUT2INC+=gsf$/gsf-input-http.h
 OUT2INC+=gsf$/gsf-outfile-zip.h
 OUT2INC+=gsf$/gsf.h
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
 
-.ENDIF
 
diff --git a/libgsf/prj/build.lst b/libgsf/prj/build.lst
index b5f0d8167c08..1a3ea01e7535 100644
--- a/libgsf/prj/build.lst
+++ b/libgsf/prj/build.lst
@@ -1,3 +1,3 @@
-gs	libgsf	: soltools NULL
+gs	libgsf	: glib soltools NULL
 gs	libgsf			    usr1	-	all	gs_mkout NULL
 gs	libgsf			    nmake	-	all	gs_libgsf NULL
diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk
index ea76a0ea8d56..81127630ee3d 100644
--- a/librsvg/makefile.mk
+++ b/librsvg/makefile.mk
@@ -47,6 +47,8 @@ LIBRSVGVERSION=2.32.1
 TARFILE_NAME=$(PRJNAME)-$(LIBRSVGVERSION)
 TARFILE_MD5=d7a242ca43e33e1b63d3073f9d46a6a8
 
+.IF "$(OS)" == "MACOSX" || "$(OS)" == "WNT"
+
 PATCH_FILES=librsvg-2.32.1.patch
 
 .IF "$(LIBXML_LIBS)" == ""
@@ -89,6 +91,8 @@ OUT2INC+=rsvg.h
 .ELIF "$(OS)"=="WNT"
 .ENDIF
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
diff --git a/librsvg/prj/build.lst b/librsvg/prj/build.lst
index 82e1fd64d1c5..e2b4d1fab07a 100644
--- a/librsvg/prj/build.lst
+++ b/librsvg/prj/build.lst
@@ -1,3 +1,3 @@
-rg	librsvg	: libcroco libgsf cairo gdk-pixbuf soltools NULL
+rg	librsvg	: pango libcroco libgsf cairo gdk-pixbuf soltools NULL
 rg	librsvg			    usr1	-	all	rg_mkout NULL
 rg	librsvg			    nmake	-	all	rg_gettext NULL
diff --git a/pango/makefile.mk b/pango/makefile.mk
index c2b18022ced0..5a7194986e20 100644
--- a/pango/makefile.mk
+++ b/pango/makefile.mk
@@ -47,6 +47,8 @@ PANGOVERSION=1.28.3
 TARFILE_NAME=$(PRJNAME)-$(PANGOVERSION)
 TARFILE_MD5=22ad1c8d3fda7e73b0798035f3dd96bc
 
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="WNT"
+
 PATCH_FILES=pango-1.28.3.patch
 
 CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)"
@@ -108,6 +110,8 @@ OUT2INC+=pango/pango-utils.h
 .ELSE
 .ENDIF
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk