Convert libpng and zlib to statically-linked subprojects of pincrush …

…(instead of aggregated individual subprojects that are manually linked in.)

Makefile

@@ -2,8 +2,7 @@ TOOL_NAME = pincrush
 pincrush_C_FILES = pincrush.c
 pincrush_CFLAGS = -I./libpng -Wno-format -std=c99 -DVERSION="\"$(shell grep Version "$(FW_PROJECT_DIR)/layout/DEBIAN/control" | cut -d' ' -f2)\""
 pincrush_LDFLAGS = -lz
-pincrush_OBJ_FILES = libpng/$(FW_OBJ_DIR_NAME)/png.a
-SUBPROJECTS = libpng
+pincrush_SUBPROJECTS = libpng
 
 include framework/makefiles/common.mk
 
@@ -21,9 +20,7 @@ else ifeq ($(FW_TARGET_NAME),windows)
 export GO_EASY_ON_ME := 1
 pincrush_CFLAGS += -I./zlib
 pincrush_LDFLAGS =
-pincrush_OBJ_FILES += zlib/$(FW_OBJ_DIR_NAME)/z.a
-SUBPROJECTS += zlib
+pincrush_SUBPROJECTS += zlib
 endif
 
-include framework/makefiles/aggregate.mk
 include framework/makefiles/tool.mk

libpng/Makefile

@@ -1,6 +1,6 @@
-LIBRARY_NAME = png
+SUBPROJECT_NAME = png
 png_C_FILES = png.c  pngerror.c  pngget.c  pngmem.c  pngpread.c  pngread.c  pngrio.c  pngrtran.c  pngrutil.c  pngset.c  pngtrans.c  pngwio.c  pngwrite.c  pngwtran.c  pngwutil.c
 png_CFLAGS = -I../zlib -DHAVE_CONFIG_H -I. -DPNG_CONFIGURE_LIBPNG -DPNG_NO_PROGRESSIVE_READ -DPNG_NO_EASY_ACCESS
 
 include ../framework/makefiles/common.mk
-include ../framework/makefiles/staticlib.mk
+include ../framework/makefiles/subproject.mk

zlib/Makefile

@@ -1,5 +1,5 @@
-LIBRARY_NAME = z
+SUBPROJECT_NAME = z
 z_C_FILES = adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c
 
 include ../framework/makefiles/common.mk
-include ../framework/makefiles/staticlib.mk
+include ../framework/makefiles/subproject.mk