X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/945a749daf29bd231440da551d3a53908880d278..f65f3bf537e517fb5231ff894e198eeb89d727ed:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index fed99c1..eb23a83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 # 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 =
@@ -56,7 +56,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,15 +76,21 @@ 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
@@ -105,6 +111,4 @@ STAMP_RECOVER = \
 .gobstamp.h: ; $(STAMP_RECOVER)
 
 include $(top_srcdir)/lib/gnulib.mk
-if BUNDLED_LIBLTDL
 include $(top_srcdir)/libltdl/ltdl.mk
-endif