X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/945a749daf29bd231440da551d3a53908880d278..8c95a9e8b7ae0e2a480d7a6de0bf4ca933799c7e:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fed99c1..60474a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
-# Copyright © 2009-2012 Nick Bowler
+# Copyright © 2009-2012, 2015 Nick Bowler
 #
 # License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 # This is free software: you are free to do what the fuck you want to.
 # There is NO WARRANTY, to the extent permitted by law.
 
 AUTOMAKE_OPTIONS = parallel-tests color-tests
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I common/m4
 MAINTAINERCLEANFILES =
 MOSTLYCLEANFILES =
 CLEANFILES =
@@ -13,6 +13,7 @@ CLEANFILES =
 EXTRA_DIST = $(MAINTAINERCLEANFILES) m4/gnulib-cache.m4
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
+	-I$(top_srcdir)/$(DX_BASEDIR)/src \
 	-I$(top_builddir)/lib -I$(top_srcdir)/lib \
 	-DPKGLIBDIR=\"$(pkglibdir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
 
@@ -36,7 +37,7 @@ upkg_LDFLAGS  = $(AM_LDFLAGS) -export-dynamic
 upkg_LDADD    = libuobject.la libupkg.la libgnu.la $(GLIB_LIBS)
 $(upkg_OBJECTS): $(gnulib_headers)
 
-libupkg_la_SOURCES = src/libupkg.c src/pack.c
+libupkg_la_SOURCES = src/libupkg.c common/src/pack.c common/src/pack.h
 
 uobjectdir = $(includedir)/uobject
 uobject_HEADERS = src/uobject/uobject.h src/uobject/exportable.h \
@@ -56,7 +57,7 @@ $(libuobject_la): $(LTDLDEPS)
 moduleflags = -module -avoid-version -export-symbols-regex _LTX_
 
 engine_GOBS = src/engine/palette.gob src/engine/texture.gob \
-	src/engine/music.gob
+	src/engine/music.gob src/engine/sound.gob
 
 MAINTAINERCLEANFILES += $(engine_GOBS:.gob=.gobstamp) \
 	$(engine_GOBS:.gob=.c) $(engine_GOBS:.gob=.h)
@@ -76,21 +77,27 @@ engine_la_SOURCES  += src/engine/music-modplug.c src/engine/modplug-types.h
 engine_la_LIBADD   += $(LIBMODPLUG_LIBS)
 endif
 
-check_PROGRAMS = test/decodeindex
-test_decodeindex_LDADD = libupkg.la libgnu.la
+check_LTLIBRARIES = libtest.la
+check_PROGRAMS = test/decodeindex test/pcxrle
+
+libtest_la_SOURCES = test/common.c
+
+test_decodeindex_LDADD = libupkg.la libgnu.la libtest.la
 $(test_decodeindex_OBJECTS): $(gnulib_headers)
+test_pcxrle_LDADD = src/engine/pcx.lo libupkg.la libgnu.la libtest.la
+$(test_pcxrle_OBJECTS): $(gnulib_headers)
 
 TESTS_ENVIRONMENT = SHELL='$(SHELL)' EXEEXT='$(EXEEXT)'
 TEST_EXTENSIONS = .sh
 SH_LOG_COMPILER = $(SHELL)
 
-TESTS = tests/libupkg-index-decode.sh
+TESTS = tests/libupkg-index-decode.sh tests/engine-pcx-rlencode.sh
 EXTRA_DIST += $(TESTS)
 
 # Supporting rules for GObject Builder
-GOB_V   = $(GOB_V_$(V))
-GOB_V_  = $(GOB_V_$(AM_DEFAULT_VERBOSITY))
-GOB_V_0 = @echo "  GOB   " $<;
+GOB_V   = $(GOB_V_@AM_V@)
+GOB_V_  = $(GOB_V_@AM_DEFAULT_V@)
+GOB_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'GOB     ' $<;
 
 # Unfortunately, GOB's output filenames depend on the contents of the gob file,
 # rather than its filename.  This isn't really suitable for use with make, so
@@ -105,6 +112,4 @@ STAMP_RECOVER = \
 .gobstamp.h: ; $(STAMP_RECOVER)
 
 include $(top_srcdir)/lib/gnulib.mk
-if BUNDLED_LIBLTDL
 include $(top_srcdir)/libltdl/ltdl.mk
-endif