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

diff --git a/Makefile.am b/Makefile.am
index 60474a5..bf4759d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2009-2012, 2015 Nick Bowler
+# Copyright © 2009-2012, 2015, 2019-2020 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.
@@ -8,6 +8,7 @@ AUTOMAKE_OPTIONS = parallel-tests color-tests
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 MAINTAINERCLEANFILES =
 MOSTLYCLEANFILES =
+DISTCLEANFILES =
 CLEANFILES =
 
 EXTRA_DIST = $(MAINTAINERCLEANFILES) m4/gnulib-cache.m4
@@ -32,7 +33,7 @@ dist_man_MANS = doc/man/upkg.1
 have_orderonly = $(findstring order-only,$(.FEATURES))
 orderonly = $(have_orderonly:order-only=|)
 
-upkg_SOURCES  = src/upkg.c
+upkg_SOURCES  = src/upkg.c src/upkg.h
 upkg_LDFLAGS  = $(AM_LDFLAGS) -export-dynamic
 upkg_LDADD    = libuobject.la libupkg.la libgnu.la $(GLIB_LIBS)
 $(upkg_OBJECTS): $(gnulib_headers)
@@ -46,7 +47,8 @@ uobject_HEADERS = src/uobject/uobject.h src/uobject/exportable.h \
 
 libuobject_la_SOURCES = src/uobject/uobject.c src/uobject/module.c \
 	src/uobject/avl.c src/uobject/avl.h src/uobject/package.c \
-	src/uobject/exportable.c src/uobject/loadable.c src/uobject/vfs.c
+	src/uobject/exportable.c src/uobject/loadable.c src/uobject/vfs.c \
+	src/uobject/primitives.c
 libuobject_la_LDFLAGS  = $(AM_LDFLAGS) -export-symbols-regex '^u_'
 libuobject_la_LIBADD   = libgnu.la $(LIBLTDL) $(GLIB_LIBS)
 $(libuobject_la_OBJECTS): $(gnulib_headers)
@@ -57,13 +59,16 @@ $(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/sound.gob
+	src/engine/music.gob src/engine/sound.gob src/engine/mesh.gob
 
 MAINTAINERCLEANFILES += $(engine_GOBS:.gob=.gobstamp) \
 	$(engine_GOBS:.gob=.c) $(engine_GOBS:.gob=.h)
 
 engine_la_SOURCES = $(engine_GOBS:.gob=.c) $(engine_GOBS:.gob=.h) \
-	src/engine/engine.c src/engine/pcx.c
+	src/engine/engine.c \
+	src/engine/music-module.h \
+	src/engine/pcx.c \
+	src/engine/pcx.h
 engine_la_LDFLAGS  = $(AM_LDFLAGS) $(moduleflags)
 engine_la_LIBADD   = $(GLIB_LIBS)
 $(engine_la_OBJECTS): $(orderonly) $(engine_GOBS:.gob=.gobstamp)
@@ -80,7 +85,7 @@ endif
 check_LTLIBRARIES = libtest.la
 check_PROGRAMS = test/decodeindex test/pcxrle
 
-libtest_la_SOURCES = test/common.c
+libtest_la_SOURCES = test/common.c test/common.h
 
 test_decodeindex_LDADD = libupkg.la libgnu.la libtest.la
 $(test_decodeindex_OBJECTS): $(gnulib_headers)
@@ -103,8 +108,24 @@ GOB_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'GOB     ' $<;
 # rather than its filename.  This isn't really suitable for use with make, so
 # this rule has to make some assumptions about the source tree layout.
 .gob.gobstamp:
+if HAVE_GOB2_DYN
 	$(GOB_V) $(GOB2) -o src --file-sep=/ --no-private-header $<
 	$(AM_V_at) touch $@
+else
+if HAVE_GOB2
+	@echo "ERROR: *** $(GOB2) does not support dynamic types." 1>&2
+else
+	@echo "ERROR: *** gob2 is missing on your system."  1>&2
+endif
+	@:; { \
+	 echo "       *** Because of this, I cannot compile $<, but"; \
+	 echo "       *** (perhaps because you modified it) the sources appear out of date."; \
+	 echo "       *** A newer version of gob2 may be required; the latest version"; \
+	 echo "       *** may be found at <https://draconx.ca/projects/gob-dx/>."; \
+	 echo "       *** See config.log for more details."; \
+	} 1>&2
+	@false
+endif
 
 STAMP_RECOVER = \
 	@if test -f $@; then :; else rm -f $<; $(MAKE) $(AM_MAKEFLAGS) $<; fi