From 22950ba3df3a0b739786243679d69cd4094e8b20 Mon Sep 17 00:00:00 2001
From: Robert de Bath <rdebath@poboxes.com>
Date: Sat, 20 Sep 2003 19:44:36 +0200
Subject: Import Dev86src-0.16.13.tar.gz

---
 as/Makefile | 9 ++-------
 as/as.c     | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'as')

diff --git a/as/Makefile b/as/Makefile
index 5873f14..dec98d1 100644
--- a/as/Makefile
+++ b/as/Makefile
@@ -1,8 +1,4 @@
 
-ifeq ($(VERSION),)
-include Version
-endif
-
 CFLAGS=-O
 LDFLAGS=-s
 LIBDIR=/usr/bin
@@ -20,7 +16,7 @@ as86: $(OBJS)
 
 as86_encap: as86_encap.sh
 	sed -e "s:%%LIBDIR%%:$(LIBDIR):" -e "s:%%BINDIR%%:$(BINDIR):" \
-		< $^ > tmp
+		< as86_encap.sh > tmp
 	@mv -f tmp $@
 	chmod +x $@
 	
@@ -35,7 +31,7 @@ clean realclean clobber:
 	rm -f *.o as86 as86_encap
 
 .c.o:
-	$(CC) -DVERSION='"$(VERSION)"' $(CFLAGS) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 as.o: const.h type.h byteord.h macro.h file.h flag.h globvar.h
 assemble.o: const.h type.h address.h globvar.h opcode.h scan.h
@@ -53,4 +49,3 @@ pops.o: const.h type.h address.h flag.h globvar.h opcode.h scan.h
 readsrc.o: const.h type.h flag.h file.h globvar.h macro.h scan.h source.h
 scan.o: const.h type.h globvar.h scan.h 
 table.o: const.h type.h globvar.h opcode.h scan.h
-
diff --git a/as/as.c b/as/as.c
index 1d58be4..d592b0b 100644
--- a/as/as.c
+++ b/as/as.c
@@ -15,6 +15,7 @@
 #include "file.h"
 #include "flag.h"
 #include "globvar.h"
+#include "version.h"
 
 PUBLIC char hexdigit[] = "0123456789ABCDEF";	/* XXX - ld uses lower case */
 
-- 
cgit v1.2.1