Fixed build system and fixed some warnings.

Makefile.am

@@ -1,2 +1,2 @@
 SUBDIRS = src
-#ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4

Makefile.scm

@@ -1,6 +1,6 @@
 all:
-	autoreconf --install --force
+	mkdir -p m4
+	autoreconf --install --force -I m4
 
 clean:
-	hg status -in | xargs -r rm -rf
-	find -type d -empty -print | xargs -r rmdir
+	rm -rf $$(cat .gitignore)

config.h

@@ -10,6 +10,9 @@
 /* Authors email address */
 #define EMAIL "k@ailis.de"
 
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
 /* Define to 1 if you have the <gd.h> header file. */
 #define HAVE_GD_H 1
 
@@ -52,8 +55,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
-/* Define to 1 if you have the <wasteland.h> header file. */
-#define HAVE_WASTELAND_H 1
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
 
 /* Name of package */
 #define PACKAGE "wlsuite"

configure.ac

@@ -1,13 +1,14 @@
-AC_PREREQ([2.65])
+AC_PREREQ([2.50])
 AC_INIT([wlsuite], [0.1], [k@ailis.de])
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
 AC_LANG_C
+AM_PROG_LIBTOOL
 
 AC_CHECK_HEADERS(gd.h,,echo "ERROR: gd.h not found"; exit 1;)
 AC_CHECK_LIB(gd,gdImageCreate,,echo "ERROR: GD library not found"; exit 1;)
-AC_CHECK_HEADERS(wasteland.h,,echo "ERROR: wasteland.h not found"; exit 1;)
 AC_CHECK_HEADERS(kaytils/str.h,,echo "ERROR: kaytils/str.h not found"; exit 1;)
 AC_CHECK_HEADERS(kaytils/list.h,,echo "ERROR: kaytils/list.h not found"; exit 1;)
 AC_CHECK_LIB(kaytils,strCreate,,echo "ERROR: kaytils library not found"; exit 1;)
@@ -19,6 +20,7 @@ AC_DEFINE(COPYRIGHT,"Copyright (C) 2010  Klaus Reimer <k@ailis.de>",Copyright me
 AC_CONFIG_FILES(
   Makefile 
   src/Makefile
+  src/libwasteland/Makefile
   src/decodehuffman/Makefile
   src/encodehuffman/Makefile
   src/decodepic/Makefile

src/Makefile.am

@@ -1,4 +1,5 @@
 SUBDIRS = \
+        libwasteland \
 	decodehuffman \
 	encodehuffman \
 	decodepic \
@@ -14,4 +15,4 @@ SUBDIRS = \
 	decodecpa \
 	unpacktiles \
 	unpackpics
-	
+

src/decodecpa/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_decodecpa
-wl_decodecpa_LDADD = -lwasteland
+wl_decodecpa_LDADD = ../libwasteland/libwasteland.la
 wl_decodecpa_SOURCES = \
 	decodecpa.c
 

src/decodecpa/decodecpa.c

@@ -14,7 +14,7 @@
 #include <string.h>
 #include <gd.h>
 #include <errno.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include "config.h"
 
 #ifdef WIN32

src/decodehuffman/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_decodehuffman
-wl_decodehuffman_LDADD = -lwasteland
+wl_decodehuffman_LDADD = ../libwasteland/libwasteland.la
 wl_decodehuffman_SOURCES = \
 	decodehuffman.c
 

src/decodehuffman/decodehuffman.c

@@ -12,7 +12,7 @@
 #include <string.h>
 #include <gd.h>
 #include <errno.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include "config.h"
 
 /** The maximum number of bytes to read. 0 = Infinite */

src/decodepic/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_decodepic
-wl_decodepic_LDADD = -lwasteland
+wl_decodepic_LDADD = ../libwasteland/libwasteland.la
 wl_decodepic_SOURCES = \
 	decodepic.c
 

src/decodepic/decodepic.c

@@ -11,7 +11,7 @@
 #include <string.h>
 #include <gd.h>
 #include <errno.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include "config.h"
 
 

src/encodehuffman/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_encodehuffman
-wl_encodehuffman_LDADD = -lwasteland
+wl_encodehuffman_LDADD = ../libwasteland/libwasteland.la
 wl_encodehuffman_SOURCES = \
 	encodehuffman.c
 

src/encodehuffman/encodehuffman.c

@@ -12,7 +12,7 @@
 #include <string.h>
 #include <gd.h>
 #include <errno.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include "config.h"
 
 

src/encodepic/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_encodepic
-wl_encodepic_LDADD = -lwasteland
+wl_encodepic_LDADD = ../libwasteland/libwasteland.la
 wl_encodepic_SOURCES = \
 	encodepic.c
 

src/encodepic/encodepic.c

@@ -11,7 +11,7 @@
 #include <string.h>
 #include <gd.h>
 #include <errno.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include "config.h"
 
 
@@ -115,14 +115,13 @@ static void writePic(char *filename, gdImagePtr image)
 {
     gdImagePtr output;
     int x, y, i;
-    int palette[16];
     wlImage pic;
 
     /* Create a temporary second image for palette conversion */
     output = gdImageCreate(288, 128);
     for (i = 0; i < 16; i++)
     {
-        palette[i] = gdImageColorAllocate(output, wlPalette[i].red,
+        gdImageColorAllocate(output, wlPalette[i].red,
                 wlPalette[i].green, wlPalette[i].blue);
     }
     for (i = 16; i < 256; i++) gdImageColorAllocate(output, 0, 0, 0);

src/libwasteland/huffman.c

@@ -362,7 +362,7 @@ void wlHuffmanDumpNode(wlHuffmanNode *node, int indent)
     }
     else
     {
-        printf(spaces);
+        printf("%s", spaces);
         if (node->keyBits <= 0 || node->keyBits > 16)
         {
             printf("Invalid keybits on payload node!!!!");

src/packcpa/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_packcpa
-wl_packcpa_LDADD = -lwasteland
+wl_packcpa_LDADD = ../libwasteland/libwasteland.la
 wl_packcpa_SOURCES = \
 	packcpa.c
 

src/packcpa/packcpa.c

@@ -13,7 +13,7 @@
 #include <gd.h>
 #include <errno.h>
 #include <dirent.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include <kaytils/str.h>
 #include <kaytils/list.h>
 #include "config.h"

src/packcursors/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_packcursors
-wl_packcursors_LDADD = -lwasteland
+wl_packcursors_LDADD = ../libwasteland/libwasteland.la
 wl_packcursors_SOURCES = \
 	packcursors.c
 

src/packcursors/packcursors.c

@@ -13,7 +13,7 @@
 #include <gd.h>
 #include <errno.h>
 #include <dirent.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include <kaytils/str.h>
 #include <kaytils/list.h>
 #include "config.h"
@@ -132,13 +132,13 @@ static void storeCursor(wlImages cursors, int index, gdImagePtr image)
 {
     gdImagePtr output;
     int x, y, i;
-    int palette[16], transparency, color;
+    int transparency, color;
 
     /* Create a temporary second image for palette conversion */
     output = gdImageCreate(16, 16);
     for (i = 0; i < 16; i++)
     {
-        palette[i] = gdImageColorAllocate(output, wlPalette[i].red,
+        gdImageColorAllocate(output, wlPalette[i].red,
                 wlPalette[i].green, wlPalette[i].blue);
     }
     transparency = gdImageColorAllocate(output, 0, 0, 0);

src/packfont/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_packfont
-wl_packfont_LDADD = -lwasteland
+wl_packfont_LDADD = ../libwasteland/libwasteland.la
 wl_packfont_SOURCES = \
 	packfont.c
 

src/packfont/packfont.c

@@ -13,7 +13,7 @@
 #include <gd.h>
 #include <errno.h>
 #include <dirent.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include <kaytils/str.h>
 #include <kaytils/list.h>
 #include "config.h"
@@ -132,13 +132,13 @@ static void storeFontGlyph(wlImages font, int index, gdImagePtr image)
 {
     gdImagePtr output;
     int x, y, i;
-    int palette[16], transparency, color;
+    int transparency, color;
 
     /* Create a temporary second image for palette conversion */
     output = gdImageCreate(8, 8);
     for (i = 0; i < 16; i++)
     {
-        palette[i] = gdImageColorAllocate(output, wlPalette[i].red,
+        gdImageColorAllocate(output, wlPalette[i].red,
                 wlPalette[i].green, wlPalette[i].blue);
     }
     transparency = gdImageColorAllocate(output, 0, 0, 0);

src/packsprites/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_packsprites
-wl_packsprites_LDADD = -lwasteland
+wl_packsprites_LDADD = ../libwasteland/libwasteland.la
 wl_packsprites_SOURCES = \
 	packsprites.c
 

src/packsprites/packsprites.c

@@ -13,7 +13,7 @@
 #include <gd.h>
 #include <errno.h>
 #include <dirent.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include <kaytils/str.h>
 #include <kaytils/list.h>
 #include "config.h"
@@ -132,13 +132,13 @@ static void storeSprite(wlImages sprites, int index, gdImagePtr image)
 {
     gdImagePtr output;
     int x, y, i;
-    int palette[16], transparency;
+    int transparency;
 
     /* Create a temporary second image for palette conversion */
     output = gdImageCreate(16, 16);
     for (i = 0; i < 16; i++)
     {
-        palette[i] = gdImageColorAllocate(output, wlPalette[i].red,
+        gdImageColorAllocate(output, wlPalette[i].red,
                 wlPalette[i].green, wlPalette[i].blue);
     }
     transparency = gdImageColorAllocate(output, 0, 0, 0);

src/unpackcpa/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_unpackcpa
-wl_unpackcpa_LDADD = -lwasteland
+wl_unpackcpa_LDADD = ../libwasteland/libwasteland.la
 wl_unpackcpa_SOURCES = \
 	unpackcpa.c
 

src/unpackcpa/unpackcpa.c

@@ -14,7 +14,7 @@
 #include <string.h>
 #include <gd.h>
 #include <errno.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include "config.h"
 
 #ifdef WIN32
@@ -125,13 +125,12 @@ static void writePng(char *filename, wlImage image)
 {    
     gdImagePtr output;
     int x, y, i;
-    int palette[17];
     FILE *file;
 
     output = gdImageCreate(288, 128);
     for (i = 0; i < 16; i++)
     {
-        palette[i] = gdImageColorAllocate(output, wlPalette[i].red,
+        gdImageColorAllocate(output, wlPalette[i].red,
                 wlPalette[i].green, wlPalette[i].blue);
     }
     for (y = 0; y < 128; y++)       

src/unpackcursors/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_unpackcursors
-wl_unpackcursors_LDADD = -lwasteland
+wl_unpackcursors_LDADD = ../libwasteland/libwasteland.la
 wl_unpackcursors_SOURCES = \
 	unpackcursors.c
 

src/unpackcursors/unpackcursors.c

@@ -14,7 +14,7 @@
 #include <string.h>
 #include <gd.h>
 #include <errno.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include "config.h"
 
 #ifdef WIN32

src/unpackfont/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_unpackfont
-wl_unpackfont_LDADD = -lwasteland
+wl_unpackfont_LDADD = ../libwasteland/libwasteland.la
 wl_unpackfont_SOURCES = \
 	unpackfont.c
 

src/unpackfont/unpackfont.c

@@ -14,7 +14,7 @@
 #include <string.h>
 #include <gd.h>
 #include <errno.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include "config.h"
 
 #ifdef WIN32

src/unpackpics/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_unpackpics
-wl_unpackpics_LDADD = -lwasteland
+wl_unpackpics_LDADD = ../libwasteland/libwasteland.la
 wl_unpackpics_SOURCES = \
 	unpackpics.c
 

src/unpackpics/unpackpics.c

@@ -14,7 +14,7 @@
 #include <string.h>
 #include <gd.h>
 #include <errno.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include <math.h>
 #include "config.h"
 

src/unpacksprites/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_unpacksprites
-wl_unpacksprites_LDADD = -lwasteland
+wl_unpacksprites_LDADD = ../libwasteland/libwasteland.la
 wl_unpacksprites_SOURCES = \
 	unpacksprites.c
 

src/unpacksprites/unpacksprites.c

@@ -14,7 +14,7 @@
 #include <string.h>
 #include <gd.h>
 #include <errno.h>
-#include <wasteland.h>
+#include "../libwasteland/wasteland.h"
 #include "config.h"
 
 #ifdef WIN32

src/unpacktiles/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = wl_unpacktiles
-wl_unpacktiles_LDADD = -lwasteland
+wl_unpacktiles_LDADD = ../libwasteland/libwasteland.la
 wl_unpacktiles_SOURCES = \
 	unpacktiles.c