From: <ams AT ludd DOT luth DOT se>
Message-Id: <200302141822.h1EIMO102255@speedy.ludd.luth.se>
Subject: djasm in djasm?
To: DJGPP-WORKERS <djgpp-workers AT delorie DOT com>
Date: Fri, 14 Feb 2003 19:22:24 +0100 (CET)
X-Mailer: ELM [version 2.4ME+ PL78 (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
X-MailScanner: Found to be clean
Reply-To: djgpp-workers AT delorie DOT com

Hello.

There was at least one request for moving djasm to it's own
directory. I'm in favour.

I've moved stub/djasm* to djasm/ ("mkdir djasm; mv stub/djasm* djasm")
and have a successful compilation.

Here are the diffs for the makefiles (pasted so probably won't apply
cleanly):
diff -Nru v:/martin/djgpp/djgpp/src/djasm/makefile ./djasm/makefile
--- v:/martin/djgpp/djgpp/src/djasm/makefile    1970-01-01 00:00:00.000000000 +0000
+++ ./djasm/makefile    2003-02-14 19:02:12.000000000 +0000
@@ -0,0 +1,32 @@
+# Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details
+# Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details
+# Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details
+
+TOP = .
+
+include ../makefile.inc
+# djasm.y would be killed by -Werror -Wall, so let's relax a bit:
+XGCC = $(XLGCC)
+
+all :: native \
+       $(BIN)/djasm.exe \
+       $E
+
+native :: \
+       $(HOSTBIN)/djasm.exe \
+       $E
+       $(NOP)
+
+
+djasm.c: djasm.y
+       $(CROSS_BISON) -o djasm.c djasm.y
+
+
+$(HOSTBIN)/djasm.exe : djasm.y
+       $(BISON) -o djasm-n.c djasm.y
+       $(GCC) djasm-n.c -o $@
+       $(MISC) rm djasm-n.c
+
+clean ::
+       @-$(MISC) rm djasm.c
+       @-$(MISC) rm $(HOSTBIN)/djasm.exe
diff -Nru v:/martin/djgpp/djgpp/src/makefile ./makefile
--- v:/martin/djgpp/djgpp/src/makefile  2003-02-08 12:18:24.000000000 +0000
+++ ./makefile  2003-02-14 19:02:00.000000000 +0000
@@ -34,11 +34,13 @@
        gcc -O2 copyrite.cc -o copyrite.exe
 
 subs:
+       $(MAKE) -C djasm native
        $(MAKE) -C stub native
        $(MAKE) -C dxe native
        $(MAKE) -C mkdoc
        $(MAKE) -C libc
        $(MAKE) -C debug
+       $(MAKE) -C djasm
        $(MAKE) -C stub
        $(MAKE) -C dxe
        $(MAKE) -C libemu
diff -Nru v:/martin/djgpp/djgpp/src/stub/makefile ./stub/makefile
--- v:/martin/djgpp/djgpp/src/stub/makefile     1998-09-27 19:03:58.000000000 +0000
+++ ./stub/makefile     2003-02-14 19:05:14.000000000 +0000
@@ -5,11 +5,9 @@
 TOP = .
 
 include ../makefile.inc
-# djasm.y would be killed by -Werror -Wall, so let's relax a bit:
 XGCC = $(XLGCC)
 
 all :: native \
-       $(BIN)/djasm.exe \
        $(BIN)/go32-v2.exe \
        $(BIN)/stubedit.exe \
        $(BIN)/stubify.exe \
@@ -19,7 +17,6 @@
        $E
 
 native :: \
-       $(HOSTBIN)/djasm.exe \
        $(HOSTBIN)/stubedit.exe \
        $(HOSTBIN)/stubify.exe \
        $(INC)/stubinfo.h \
@@ -27,19 +24,16 @@
        $(NOP)
 
 
-sbrk16.ah : sbrk16.asm $(HOSTBIN)/djasm.exe
+sbrk16.ah : sbrk16.asm
        $(HOSTBIN)/djasm.exe sbrk16.asm sbrk16.ah
 
 $(INC)/stubinfo.h : stub.asm stub.map ./stub2inc.exe
        ./stub2inc.exe stub.map stub.asm $(INC)/stubinfo.h
 
-stub.h stub.map : stub.asm $(HOSTBIN)/djasm.exe
+stub.h stub.map : stub.asm
        $(HOSTBIN)/djasm.exe stub.asm stub.h stub.map
 
 
-djasm.c: djasm.y
-       $(CROSS_BISON) -o djasm.c djasm.y
-
 # with a native build, gcc is *using* stubify!
 $(BIN)/stubify.exe : stubbify.exe
        $(MISC) cp $< $(BIN)/stubify.exe
@@ -65,11 +59,6 @@
        $(EXE)
 
 
-$(HOSTBIN)/djasm.exe : djasm.y
-       $(BISON) -o djasm-n.c djasm.y
-       $(GCC) djasm-n.c -o $@
-       $(MISC) rm djasm-n.c
-
 $(HOSTBIN)/stubify.exe : stubify.c stub.h
        $(GCC) stubify.c -o $@
 
@@ -80,5 +69,5 @@
        $(GCC) stub2inc.c -o $@
 
 clean ::
-       @-$(MISC) rm djasm.c stub.map stub.h stub2inc.exe stubbify.exe
-       @-$(MISC) rm $(HOSTBIN)/djasm.exe $(HOSTBIN)/stubedit.exe $(HOSTBIN)/stubify.exe
+       @-$(MISC) rm stub.map stub.h stub2inc.exe stubbify.exe
+       @-$(MISC) rm $(HOSTBIN)/stubedit.exe $(HOSTBIN)/stubify.exe


Do you want this?

As a bonus we can stop relaxing warnings for stub/, which will give us
at least one new warning for the files left there.


Right,

						MartinS