$NetBSD$

--- makefile.common.orig	2014-07-23 21:58:44.000000000 +0000
+++ makefile.common
@@ -5,16 +5,16 @@ CXX=g++
 CFLAGS+=-O3 -Wall -Ibme -Iasm
 CXXFLAGS=$(CFLAGS)
 
-EXE=	$(PREFIX)goattrk2$(SUFFIX) \
-	$(PREFIX)gt2reloc$(SUFFIX) \
-	$(PREFIX)ins2snd2$(SUFFIX) \
-	$(PREFIX)sngspli2$(SUFFIX) \
-	$(PREFIX)betaconv$(SUFFIX) \
-	$(PREFIX)mod2sng$(SUFFIX)
+EXE=	goattrk2 \
+	gt2reloc \
+	ins2snd2 \
+	sngspli2 \
+	betaconv \
+	mod2sng
 
-all: $(EXE)
+all: dat2inc datafile $(EXE)
 
-$(PREFIX)goattrk2$(SUFFIX): goatdata.o goattrk2.o gsong.o gorder.o gpattern.o ginstr.o gtable.o gplay.o gdisplay.o \
+goattrk2: goatdata.o goattrk2.o gsong.o gorder.o gpattern.o ginstr.o gtable.o gplay.o gdisplay.o \
 gfile.o greloc.o ghelp.o gsound.o gconsole.o gsid.o \
 resid/envelope.o resid/extfilt.o resid/filter.o resid/pot.o resid/sid.o resid/wave.o resid/wave6581__ST.o \
 resid/wave6581_P_T.o resid/wave6581_PS_.o resid/wave6581_PST.o resid/wave8580__ST.o resid/wave8580_P_T.o \
@@ -34,7 +34,7 @@ greloc2.o: greloc.c
 	
 # it would be nice not having to link things like resid, however the source is
 # not ready for that
-$(PREFIX)gt2reloc$(SUFFIX): goatdata.o gt2reloc.o gsong.o gorder.o gpattern.o ginstr.o gtable.o gplay.o gdisplay.o \
+gt2reloc: goatdata.o gt2reloc.o gsong.o gorder.o gpattern.o ginstr.o gtable.o gplay.o gdisplay.o \
 gfile.o greloc2.o ghelp.o gsound.o gconsole.o gsid.o \
 resid/envelope.o resid/extfilt.o resid/filter.o resid/pot.o resid/sid.o resid/wave.o resid/wave6581__ST.o \
 resid/wave6581_P_T.o resid/wave6581_PS_.o resid/wave6581_PST.o resid/wave8580__ST.o resid/wave8580_P_T.o \
@@ -47,27 +47,35 @@ bme/bme_gfx.o bme/bme_snd.o bme/bme_win.
 	$(CXX) -DGT2RELOC -o $@ $^ $(LIBS)
 	strip $@
 	
-$(PREFIX)mod2sng$(SUFFIX): mod2sng.o bme/bme_end.o
+mod2sng: mod2sng.o bme/bme_end.o
 	gcc -o $@ $^
 	strip $@
 
-$(PREFIX)ins2snd2$(SUFFIX): ins2snd2.o bme/bme_end.o
+ins2snd2: ins2snd2.o bme/bme_end.o
 	gcc -o $@ $^
 	strip $@
 
-$(PREFIX)sngspli2$(SUFFIX): sngspli2.o bme/bme_end.o
+sngspli2: sngspli2.o bme/bme_end.o
 	gcc -o $@ $^
 	strip $@
 
-$(PREFIX)betaconv$(SUFFIX): betaconv.o bme/bme_end.o
+betaconv: betaconv.o bme/bme_end.o
+	gcc -o $@ $^
+	strip $@
+
+datafile: bme/datafile.o bme/bme_end.o
+	gcc -o $@ $^ $(LIBS)
+	strip $@
+
+dat2inc: bme/dat2inc.o
 	gcc -o $@ $^
 	strip $@
 
 goattrk2.dat: player.s altplayer.s chargen.bin palette.bin cursor.bin goattrk2.bmp goattrk2.seq
-	datafile $@ goattrk2.seq
+	./datafile $@ goattrk2.seq
 
 goatdata.c: goattrk2.dat
-	dat2inc $< $@
+	./dat2inc $< $@
 
 clean:
 	$(RM) *.o *~
