@@ -1,17 +1,17 @@
 # developer -*-Makefile-*-
 
 HOST = i486-linux
 CPU = i386
 GCC = gcc
-GCCFLAGS = -O2 -fomit-frame-pointer -DHAVE_LONGLONG -DREENTRANT
+GCCFLAGS = -O2 -fomit-frame-pointer -DHAVE_LONG_LONG_INT -DREENTRANT
 LN = ln -s
 RM = rm -f
 SED = sed
 ROFF_MAN = groff -Tascii -mandoc
 
-all : vacall-i386-macro.S vacall-i386-msvc.c vacall-i386-mingw32.c vacall-m68k.mit.S vacall-m68k.mot.s vacall-mips.S vacall-mipsn32.S vacall-mips64.S vacall-sparc.S vacall-sparc64.S vacall-alpha.s vacall-hppa.s vacall-arm.S vacall-rs6000-aix.old.s vacall-rs6000-aix.new.s vacall-rs6000-sysv4.s vacall-rs6000-macos.s vacall-m88k.s vacall-convex.s vacall-ia64.s vacall-x86_64.s \
+all : vacall-i386-macro.S vacall-i386-msvc.c vacall-i386-mingw32.c vacall-m68k.mit.S vacall-m68k.mot.s vacall-m68k-netbsd.S vacall-mips.S vacall-mipsn32.S vacall-mips64.S vacall-sparc.S vacall-sparc64.S vacall-alpha.s vacall-hppa.s vacall-arm.S vacall-armel.s vacall-powerpc-aix.old.s vacall-powerpc-aix.new.s vacall-powerpc-sysv4.s vacall-powerpc-macos.s vacall-powerpc64.s vacall-m88k.s vacall-convex.s vacall-ia64.s vacall-x86_64.s \
       vacall_r.h.msvc config.h.msvc vacall_r.h.mingw32 config.h.mingw32
 
 vacall-i386-macro.S : vacall-i386.c vacall_r.h.in asmi386.sh
 	$(GCC) -V 2.7.2 -b i486-linuxaout $(GCCFLAGS) -D__i386__ -S vacall-i386.c -o vacall-i386.s
 	(echo '#include "asmi386.h"' ; sed -e '/\.align.*,0x90$$/d' < vacall-i386.s | ./asmi386.sh) > vacall-i386-macro.S
@@ -28,10 +28,15 @@
 	(echo '#include "asmm68k.h"' ; ./asmm68k.sh < vacall-m68k.mit.s) > vacall-m68k.mit.S
 	$(RM) vacall-m68k.mit.s
 
 vacall-m68k.mot.s : vacall-m68k.c vacall_r.h.in
 	$(GCC) -V 2.95.2 -b m68k-linux $(GCCFLAGS) -D__m68k__ -S vacall-m68k.c -o vacall-m68k.mot.s
+
+vacall-m68k-netbsd.S : vacall-m68k.c vacall_r.h.in
+	$(GCC) -V 2.95.2 -b m68k-sun $(GCCFLAGS) -D__m68k__ -D__NetBSD__ -S vacall-m68k.c -o vacall-m68k-netbsd.s
+	(echo '#include "asmm68k.h"' ; ./asmm68k.sh < vacall-m68k-netbsd.s) > vacall-m68k-netbsd.S
+	$(RM) vacall-m68k-netbsd.s
 
 vacall-mips.S : vacall-mips.c vacall_r.h.in asmmips.sh
 	$(GCC) -V 2.95.2 -b mips-sgi $(GCCFLAGS) -D__mips__ -fno-omit-frame-pointer -S vacall-mips.c -o vacall-mips.s
 	(echo '#include "asmmips.h"' ; ./asmmips.sh < vacall-mips.s) > vacall-mips.S
 	$(RM) vacall-mips.s
@@ -67,21 +72,27 @@
 vacall-arm.S : vacall-arm.c vacall_r.h.in asmarm.sh
 	$(GCC) -V 2.6.3 -b arm-acorn-riscix $(GCCFLAGS) -D__arm__ -S vacall-arm.c -o vacall-arm.s
 	(echo '#include "asmarm.h"' ; ./asmarm.sh < vacall-arm.s) > vacall-arm.S
 	$(RM) vacall-arm.s
 
-vacall-rs6000-aix.old.s : vacall-rs6000.c vacall_r.h.in
-	$(GCC) -V 2.95.2 -b rs6000 -mno-power -mno-power2 -mno-powerpc -mold-mnemonics $(GCCFLAGS) -D__rs6000__ -S vacall-rs6000.c -o vacall-rs6000-aix.old.s
-
-vacall-rs6000-aix.new.s : vacall-rs6000.c vacall_r.h.in
-	$(GCC) -V 2.95.2 -b rs6000 -mno-power -mno-power2 -mno-powerpc -mnew-mnemonics $(GCCFLAGS) -D__rs6000__ -S vacall-rs6000.c -o vacall-rs6000-aix.new.s
-
-vacall-rs6000-sysv4.s : vacall-rs6000.c vacall_r.h.in
-	$(GCC) -V 2.95.2 -b ppc-linux -mno-power -mno-power2 -mno-powerpc $(GCCFLAGS) -D__rs6000__ -S vacall-rs6000.c -o vacall-rs6000-sysv4.s
-
-vacall-rs6000-macos.s : vacall-rs6000.c vacall_r.h.in
-	$(GCC) -V 3.3.2 -b powerpc-darwin $(GCCFLAGS) -D__rs6000__ -S vacall-rs6000.c -o vacall-rs6000-macos.s
+vacall-armel.s : vacall-armel.c vacall_r.h.in
+	$(GCC) $(GCCFLAGS) -D__arm__ -D__ARMEL__ -DHAVE_LONG_LONG -fomit-frame-pointer -S vacall-armel.c -o vacall-armel.s
+
+vacall-powerpc-aix.old.s : vacall-powerpc.c vacall_r.h.in
+	$(GCC) -V 2.95.2 -b rs6000 -mno-power -mno-power2 -mno-powerpc -mold-mnemonics $(GCCFLAGS) -D__powerpc__ -S vacall-powerpc.c -o vacall-powerpc-aix.old.s
+
+vacall-powerpc-aix.new.s : vacall-powerpc.c vacall_r.h.in
+	$(GCC) -V 2.95.2 -b rs6000 -mno-power -mno-power2 -mno-powerpc -mnew-mnemonics $(GCCFLAGS) -D__powerpc__ -S vacall-powerpc.c -o vacall-powerpc-aix.new.s
+
+vacall-powerpc-sysv4.s : vacall-powerpc.c vacall_r.h.in
+	$(GCC) -V 2.95.2 -b ppc-linux -mno-power -mno-power2 -mno-powerpc $(GCCFLAGS) -D__powerpc__ -S vacall-powerpc.c -o vacall-powerpc-sysv4.s
+
+vacall-powerpc-macos.s : vacall-powerpc.c vacall_r.h.in
+	$(GCC) -V 3.3.2 -b powerpc-darwin $(GCCFLAGS) -D__powerpc__ -S vacall-powerpc.c -o vacall-powerpc-macos.s
+
+vacall-powerpc64.s : vacall-powerpc64.c vacall_r.h.in
+	/cross/powerpc64-linux-tools/bin/powerpc64-linux-gcc $(GCCFLAGS) -D__powerpc64__ -S vacall-powerpc64.c -o vacall-powerpc64.s
 
 vacall-m88k.s : vacall-m88k.c vacall_r.h.in
 	$(GCC) -V 2.95.2 -b m88k-dgux $(GCCFLAGS) -D__m88k__ -S vacall-m88k.c -o vacall-m88k.s
 
 vacall-convex.s : vacall-convex.c vacall_r.h.in
@@ -94,16 +105,22 @@
 	$(GCC) -V 3.2.2 -b x86_64-suse-linux $(GCCFLAGS) -D__x86_64__ -S vacall-x86_64.c -o vacall-x86_64.s
 
 vacall_r.man : vacall_r.3
 	$(ROFF_MAN) vacall_r.3 > vacall_r.man
 
-vacall_r.h.msvc : vacall_r.h.in
-	sed -e 's,^#undef __i386__$$,#define __i386__ 1,' -e 's,^#undef __SMALL_STRUCT_RETURN__$$,#define __SMALL_STRUCT_RETURN__ 1,' < vacall_r.h.in > vacall_r.h.msvc
+VERSION = $(shell cat ../../VERSION)
+
+vacall_r.h.msvc : vacall_r.h.in ../../VERSION
+	sed -e 's,^#undef __i386__$$,#define __i386__ 1,' \
+	    -e 's,@LIBFFCALL_VERSION@,$(VERSION),' \
+	    -e 's,^#undef __SMALL_STRUCT_RETURN__$$,#define __SMALL_STRUCT_RETURN__ 1,' < vacall_r.h.in > vacall_r.h.msvc
 
-vacall_r.h.mingw32 : vacall_r.h.in
-	sed -e 's,^#undef __i386__$$,#define __i386__ 1,' -e 's,^#undef __SMALL_STRUCT_RETURN__$$,#define __SMALL_STRUCT_RETURN__ 1,' < vacall_r.h.in > vacall_r.h.mingw32
+vacall_r.h.mingw32 : vacall_r.h.in ../../VERSION
+	sed -e 's,^#undef __i386__$$,#define __i386__ 1,' \
+	    -e 's,@LIBFFCALL_VERSION@,$(VERSION),' \
+	    -e 's,^#undef __SMALL_STRUCT_RETURN__$$,#define __SMALL_STRUCT_RETURN__ 1,' < vacall_r.h.in > vacall_r.h.mingw32
 
 config.h.msvc : config.h.in
 	cp config.h.in config.h.msvc
 
 config.h.mingw32 : config.h.in
 	cp config.h.in config.h.mingw32