Avoid referring to parent directories in makefiles

marzojr · marzojr · commit c3a08b0b0850 · 2024-03-26T17:48:55.000+01:00
All such references are now done in terms of top_builddir or top_srcdir. Related to exult#48
diff --git a/android/lib/src/Makefile.am b/android/lib/src/Makefile.am
@@ -1,4 +1,5 @@
-AM_CPPFLAGS = -I$(srcdir)/../include -I$(top_srcdir) -I$(top_srcdir)/headers -I$(top_srcdir)/conf $(SDL_CFLAGS) $(INCDIRS)	\
+AM_CPPFLAGS = -I$(top_srcdir)/android/lib/include -I$(top_srcdir) \
+		-I$(top_srcdir)/headers -I$(top_srcdir)/conf $(SDL_CFLAGS) $(INCDIRS) \
 		$(WINDOWING_SYSTEM) $(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS)
 
 noinst_LTLIBRARIES = libandroid.la
diff --git a/conf/Makefile.am b/conf/Makefile.am
@@ -18,7 +18,7 @@ confregress_SOURCES =	\
 
 confregress_LDADD =	\
 	libconf.la	\
-	../files/libu7file.la	\
+	$(top_builddir)/files/libu7file.la	\
 	$(SYSLIBS)
 
 EXTRA_DIST = 		\
diff --git a/content/bg/Makefile.am b/content/bg/Makefile.am
@@ -2,12 +2,10 @@
 # Instead, run makefile_builder.sh from the parent directory.
 
 # Base of the exult source
-SRC=../..
-
-UCCDIR=$(SRC)/usecode/compiler
+UCCDIR=$(top_srcdir)/usecode/compiler
 UCC=$(UCCDIR)/ucc
 
-EXPACKDIR=$(SRC)/tools
+EXPACKDIR=$(top_srcdir)/tools
 EXPACK=$(EXPACKDIR)/expack
 
 USECODE_OBJECTS = \
diff --git a/content/bgkeyring/Makefile.am b/content/bgkeyring/Makefile.am
@@ -2,12 +2,10 @@
 # Instead, run makefile_builder.sh from the parent directory.
 
 # Base of the exult source
-SRC=../..
-
-UCCDIR=$(SRC)/usecode/compiler
+UCCDIR=$(top_srcdir)/usecode/compiler
 UCC=$(UCCDIR)/ucc
 
-EXPACKDIR=$(SRC)/tools
+EXPACKDIR=$(top_srcdir)/tools
 EXPACK=$(EXPACKDIR)/expack
 
 USECODE_OBJECTS = \
diff --git a/content/islefaq/Makefile.am b/content/islefaq/Makefile.am
@@ -2,20 +2,22 @@
 # Instead, run makefile_builder.sh from the parent directory.
 
 # Base of the exult source
-SRC=../..
-
-UCCDIR=$(SRC)/usecode/compiler
+UCCDIR=$(top_srcdir)/usecode/compiler
 UCC=$(UCCDIR)/ucc
 
-EXPACKDIR=$(SRC)/tools
+EXPACKDIR=$(top_srcdir)/tools
 EXPACK=$(EXPACKDIR)/expack
 
 USECODE_OBJECTS = \
 	src/usecode.uc	
 
 FACES_VGA_OBJECTS = \
 	src/graphics/faces.in	\
-	src/graphics/faces/dominus.shp	
+	src/graphics/faces/colourless.shp	\
+	src/graphics/faces/dominus.shp	\
+	src/graphics/faces/drcode.shp	\
+	src/graphics/faces/fingolfin.shp	\
+	src/graphics/faces/wjp.shp	
 
 SHAPES_VGA_OBJECTS = \
 	src/graphics/shapes.in	\
@@ -34,14 +36,19 @@ nodist_islefaqpatch_DATA = \
 	patch/shapes.vga	
 
 islefaqpatch_DATA = \
+	patch/equip.dat	\
 	patch/initgame.dat	\
+	patch/minimaps.vga	\
+	patch/occlude.dat	\
 	patch/ready.dat	\
 	patch/shpdims.dat	\
+	patch/textmsg.txt	\
 	patch/tfa.dat	\
 	patch/u7ifix0d	\
 	patch/u7ifix64	\
 	patch/u7ifix65	\
 	patch/u7map	\
+	patch/wgtvol.dat	\
 	patch/wihh.dat	
 
 EXTRA_DIST = \
diff --git a/content/islefaq/Makefile.mingw b/content/islefaq/Makefile.mingw
@@ -23,7 +23,11 @@ USECODE_OBJECTS = \
 
 FACES_VGA_OBJECTS = \
 	src/graphics/faces.in	\
-	src/graphics/faces/dominus.shp	
+	src/graphics/faces/colourless.shp	\
+	src/graphics/faces/dominus.shp	\
+	src/graphics/faces/drcode.shp	\
+	src/graphics/faces/fingolfin.shp	\
+	src/graphics/faces/wjp.shp	
 
 SHAPES_VGA_OBJECTS = \
 	src/graphics/shapes.in	\
@@ -45,14 +49,19 @@ install: all
 	cp patch/usecode $(islefaqdir)/islefaq/patch/usecode
 	cp patch/faces.vga $(islefaqdir)/islefaq/patch/faces.vga
 	cp patch/shapes.vga $(islefaqdir)/islefaq/patch/shapes.vga
+	cp patch/equip.dat $(islefaqdir)/islefaq/patch/equip.dat
 	cp patch/initgame.dat $(islefaqdir)/islefaq/patch/initgame.dat
+	cp patch/minimaps.vga $(islefaqdir)/islefaq/patch/minimaps.vga
+	cp patch/occlude.dat $(islefaqdir)/islefaq/patch/occlude.dat
 	cp patch/ready.dat $(islefaqdir)/islefaq/patch/ready.dat
 	cp patch/shpdims.dat $(islefaqdir)/islefaq/patch/shpdims.dat
+	cp patch/textmsg.txt $(islefaqdir)/islefaq/patch/textmsg.txt
 	cp patch/tfa.dat $(islefaqdir)/islefaq/patch/tfa.dat
 	cp patch/u7ifix0d $(islefaqdir)/islefaq/patch/u7ifix0d
 	cp patch/u7ifix64 $(islefaqdir)/islefaq/patch/u7ifix64
 	cp patch/u7ifix65 $(islefaqdir)/islefaq/patch/u7ifix65
 	cp patch/u7map $(islefaqdir)/islefaq/patch/u7map
+	cp patch/wgtvol.dat $(islefaqdir)/islefaq/patch/wgtvol.dat
 	cp patch/wihh.dat $(islefaqdir)/islefaq/patch/wihh.dat
 	cp README $(islefaqdir)/islefaq/Readme.txt
 	cp ./../../COPYING $(islefaqdir)/islefaq/License.txt
diff --git a/content/makefile_builder.sh b/content/makefile_builder.sh
@@ -73,12 +73,10 @@ find . -mindepth 2 -iname "*.cfg" | while read -r cfgfile; do
 # Instead, run makefile_builder.sh from the parent directory.
 
 # Base of the exult source
-SRC=../..
-
-UCCDIR=\$(SRC)/usecode/compiler
+UCCDIR=\$(top_srcdir)/usecode/compiler
 UCC=\$(UCCDIR)/ucc
 
-EXPACKDIR=\$(SRC)/tools
+EXPACKDIR=\$(top_srcdir)/tools
 EXPACK=\$(EXPACKDIR)/expack
 " >> "$modmakefile_am"
 
diff --git a/content/si/Makefile.am b/content/si/Makefile.am
@@ -2,12 +2,10 @@
 # Instead, run makefile_builder.sh from the parent directory.
 
 # Base of the exult source
-SRC=../..
-
-UCCDIR=$(SRC)/usecode/compiler
+UCCDIR=$(top_srcdir)/usecode/compiler
 UCC=$(UCCDIR)/ucc
 
-EXPACKDIR=$(SRC)/tools
+EXPACKDIR=$(top_srcdir)/tools
 EXPACK=$(EXPACKDIR)/expack
 
 USECODE_OBJECTS = \
diff --git a/content/sifixes/Makefile.am b/content/sifixes/Makefile.am
@@ -2,12 +2,10 @@
 # Instead, run makefile_builder.sh from the parent directory.
 
 # Base of the exult source
-SRC=../..
-
-UCCDIR=$(SRC)/usecode/compiler
+UCCDIR=$(top_srcdir)/usecode/compiler
 UCC=$(UCCDIR)/ucc
 
-EXPACKDIR=$(SRC)/tools
+EXPACKDIR=$(top_srcdir)/tools
 EXPACK=$(EXPACKDIR)/expack
 
 USECODE_OBJECTS = \
diff --git a/data/Makefile.am b/data/Makefile.am
@@ -222,11 +222,11 @@ EXTRA_DIST = flx.in $(EXULT_FLX_OBJECTS) $(EXULT_BG_FLX_OBJECTS) \
 if CROSS_COMPILING
 expack = $(EXPACK)
 else
-expack = ../tools/expack$(EXEEXT)
+expack = $(top_builddir)/tools/expack$(EXEEXT)
 endif
 
-../tools/expack$(EXEEXT):
-	+(cd ../tools;$(MAKE) expack$(EXEEXT))
+$(top_srcdir)/tools/expack$(EXEEXT):
+	+(cd $(top_srcdir)/tools;$(MAKE) expack$(EXEEXT))
 
 bg/bg_paperdol.vga: $(expack) $(EXULT_BG_PAPERDOL_VGA_OBJECTS)
 	$(expack) -i $(srcdir)/bg/bg_paperdol.in
diff --git a/mapedit/Makefile.am b/mapedit/Makefile.am
@@ -25,9 +25,9 @@ u7shp_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/files -I$(top_srcdir)/headers \
 	$(DEBUG_LEVEL) $(OPT_LEVEL) $(WARNINGS) $(CPPFLAGS) -DHAVE_CONFIG_H
 
 u7shp_LDADD = \
-	../imagewin/libimagewin.la	\
-	../shapes/libshapes.la \
-	../files/libu7file.la \
+	$(top_builddir)/imagewin/libimagewin.la	\
+	$(top_builddir)/shapes/libshapes.la \
+	$(top_builddir)/files/libu7file.la \
 	$(GIMP_LIBS)
 
 exult_studio_SOURCES = \
@@ -72,15 +72,15 @@ exult_studio_SOURCES = \
 noinst_PROGRAMS = $(GIMP_PLUGINS)
 
 exult_studio_LDADD = \
-	../conf/libconf.la		\
-	../imagewin/libimagewin.la	\
-	../gamemgr/libgamemgr.la	\
-	../shapes/libshapes.la 		\
-	../files/libu7file.la		\
-	../files/zip/libminizip.la		\
-	../server/libserver.la		\
-	../usecode/libusecode.la		\
-	../shapes/shapeinf/libshapeinf.la	\
+	$(top_builddir)/conf/libconf.la		\
+	$(top_builddir)/imagewin/libimagewin.la	\
+	$(top_builddir)/gamemgr/libgamemgr.la	\
+	$(top_builddir)/shapes/libshapes.la 		\
+	$(top_builddir)/files/libu7file.la		\
+	$(top_builddir)/files/zip/libminizip.la		\
+	$(top_builddir)/server/libserver.la		\
+	$(top_builddir)/usecode/libusecode.la		\
+	$(top_builddir)/shapes/shapeinf/libshapeinf.la	\
 	$(PNG_LIBS) $(FREETYPE2_LIBS) $(SYSLIBS) $(x_libraries) $(GTK_LIBS) $(ICU_LIBS) $(ZLIB_LIBS)
 
 exult_studio_CFLAGS = $(GTK_CFLAGS) $(PNG_CFLAGS) $(ICU_CFLAGS)
diff --git a/tools/Makefile.am b/tools/Makefile.am
@@ -43,25 +43,25 @@ expack_SOURCES = \
 	expack.cc
 
 expack_LDADD = \
-	../files/libu7file.la \
+	$(top_builddir)/files/libu7file.la \
 	$(SYSLIBS)
 
 ipack_SOURCES = \
 	ipack.cc
 
 ipack_LDADD = \
-	../files/libu7file.la \
-	../shapes/libshapes.la \
-	../imagewin/libimagewin.la \
+	$(top_builddir)/files/libu7file.la \
+	$(top_builddir)/shapes/libshapes.la \
+	$(top_builddir)/imagewin/libimagewin.la \
 	$(PNG_LIBS) $(ZLIB_LIBS) $(SYSLIBS)
 
 gnome_shp_thumbnailer_SOURCES = \
 	gnome_shp_thumbnailer.cc
 
 gnome_shp_thumbnailer_LDADD = \
-	../shapes/libshapes.la \
-	../imagewin/libimagewin.la \
-	../files/libu7file.la \
+	$(top_builddir)/shapes/libshapes.la \
+	$(top_builddir)/imagewin/libimagewin.la \
+	$(top_builddir)/files/libu7file.la \
 	$(PNG_LIBS) $(ZLIB_LIBS) $(SYSLIBS) $(GDK_PIXBUF_LIBS)
 
 if BUILD_GTHUMB
@@ -98,21 +98,21 @@ splitshp_LDADD = $(SYSLIBS)
 textpack_SOURCES = textpack.cc
 
 textpack_LDADD = \
-	../files/libu7file.la \
+	$(top_builddir)/files/libu7file.la \
 	$(SYSLIBS)
 
 u7voice2syx_SOURCES = u7voice2syx.cc
 
 u7voice2syx_LDADD = \
-	../files/libu7file.la \
+	$(top_builddir)/files/libu7file.la \
 	$(SYSLIBS)
 
 cmanip_SOURCES = \
 	cmanip.cc
 
 cmanip_LDADD = \
-	../conf/libconf.la \
-	../files/libu7file.la \
+	$(top_builddir)/conf/libconf.la \
+	$(top_builddir)/files/libu7file.la \
 	$(SYSLIBS)
 
 if BUILD_GTHUMB
diff --git a/usecode/compiler/Makefile.am b/usecode/compiler/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = ucc
 endif
 
 ucc_LDADD = 			\
-	../libusecode.la	\
+	$(top_builddir)/usecode/libusecode.la	\
 	$(SYSLIBS)
 
 ucparse.h: ucparse.cc
diff --git a/usecode/ucxt/data/Makefile.am b/usecode/ucxt/data/Makefile.am
@@ -4,9 +4,15 @@ if BUILD_TOOLS
 if CROSS_COMPILING
 head2data = $(HEAD2DATA)
 else
-head2data = ../head2data
+head2data = $(top_builddir)/usecode/ucxt/head2data
 endif
-u7bgintrinsics.data u7siintrinsics.data u7sibetaintrinsics.data: $(head2data) ../../bgintrinsics.h ../../siintrinsics.h ../../sibetaintrinsics.h
+
+ucxtdata_headers: \
+	$(top_builddir)/usecode/bgintrinsics.h \
+	$(top_builddir)/usecode/siintrinsics.h \
+	$(top_builddir)/usecode/sibetaintrinsics.h
+
+u7bgintrinsics.data u7siintrinsics.data u7sibetaintrinsics.data: $(head2data) $(ucxtdata_headers)
 	$(head2data) u7bgintrinsics.data u7siintrinsics.data u7sibetaintrinsics.data
 endif
 
diff --git a/usecode/ucxt/src/Makefile.am b/usecode/ucxt/src/Makefile.am
@@ -9,11 +9,11 @@ ucxt_SOURCES = \
 	ucfunc.cc
 
 ucxt_LDADD = \
-	../../../conf/libconf.la \
-	../../../gamemgr/libgamemgr.la \
-	../../../files/libu7file.la \
-	../../../files/zip/libminizip.la \
-	../../../usecode/libusecode.la \
+	$(top_builddir)/conf/libconf.la \
+	$(top_builddir)/gamemgr/libgamemgr.la \
+	$(top_builddir)/files/libu7file.la \
+	$(top_builddir)/files/zip/libminizip.la \
+	$(top_builddir)/usecode/libusecode.la \
 	$(ZLIB_LIBS) \
 	$(SYSLIBS)
 
