Merge branch 'master' of https://github.com/fabiangreffrath/woof

Makefile.am

@@ -9,5 +9,6 @@ SUBDIRS = \
 	configs \
 	docs \
 	examples \
+	pkg \
 	Source \
 	toolsrc

configure.ac

@@ -54,8 +54,6 @@ AC_CHECK_TYPES([ptrdiff_t])
 # Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_ERROR_AT_LINE
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
 AC_CHECK_FUNCS([atexit memmove memset mkdir pow putenv strcasecmp strchr strdup strerror strncasecmp strrchr strstr strtol])
 
 AC_ARG_ENABLE([dogs], AS_HELP_STRING([--disable-dogs], [Disable support for helper dogs]))
@@ -84,6 +82,7 @@ examples/Makefile
 Source/Makefile
 Source/resource.rc
 toolsrc/Makefile
+pkg/Makefile
 pkg/config.make
 ])
 AC_OUTPUT

pkg/Makefile.am

@@ -1,8 +1,7 @@
 
 WIN32_FILES=                                                            \
 win32/GNUmakefile                                                       \
-win32/cp-with-libs                                                      \
-win32/README
+win32/cp-with-libs
 
 EXTRA_DIST=$(WIN32_FILES)
 

pkg/config.make.in

@@ -6,9 +6,8 @@
 # Tools needed:
 
 CC = @CC@
-OBJDUMP = @OBJDUMP@
 STRIP = @STRIP@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @SDL_LIBS@
 
 # Package name and version number:
 

pkg/win32/GNUmakefile

@@ -3,7 +3,7 @@ include ../config.make
 
 TOPLEVEL=../..
 
-ZIP=$(PACKAGE)$(PACKAGE_VERSION)-win32.zip
+ZIP=$(PACKAGE)-$(PACKAGE_VERSION)-win32.zip
 
 all: $(ZIP)
 
@@ -12,7 +12,7 @@ $(ZIP): staging
 
 staging:
 	mkdir $@
-	LC_ALL=C ./cp-with-libs --ldflags="$(LDFLAGS)" "$(TOPLEVEL)/Source/woof.exe"
+	LC_ALL=C ./cp-with-libs --ldflags="$(LDFLAGS)" "$(TOPLEVEL)/Source/woof.exe" $@
 
 	$(STRIP) $@/*.exe $@/*.dll