From e414f46c4d8c6a44be887b31af3e01d1ded56f97 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Tue, 4 Oct 2005 18:34:21 +0000 Subject: [PATCH] * Added install/uninstall rules to the lcc and q3asm Makefiles * Moved the q3asm dir to asm so that is doesn't clash with the binary when installed --- code/tools/{q3asm => asm}/Makefile | 5 +++++ code/tools/{q3asm => asm}/README.Id | 0 code/tools/{q3asm => asm}/cmdlib.c | 0 code/tools/{q3asm => asm}/cmdlib.h | 0 code/tools/{q3asm => asm}/lib.txt | 0 code/tools/{q3asm => asm}/mathlib.h | 0 code/tools/{q3asm => asm}/notes.txt | 0 code/tools/{q3asm => asm}/ops.txt | 0 code/tools/{q3asm => asm}/opstrings.h | 0 code/tools/{q3asm => asm}/q3asm.c | 0 code/tools/{q3asm => asm}/q3asm.sln | 0 code/tools/{q3asm => asm}/q3asm.vcproj | 0 code/tools/{q3asm => asm}/qfiles.h | 0 code/tools/lcc/makefile | 20 ++++++-------------- 14 files changed, 11 insertions(+), 14 deletions(-) rename code/tools/{q3asm => asm}/Makefile (72%) rename code/tools/{q3asm => asm}/README.Id (100%) rename code/tools/{q3asm => asm}/cmdlib.c (100%) rename code/tools/{q3asm => asm}/cmdlib.h (100%) rename code/tools/{q3asm => asm}/lib.txt (100%) rename code/tools/{q3asm => asm}/mathlib.h (100%) rename code/tools/{q3asm => asm}/notes.txt (100%) rename code/tools/{q3asm => asm}/ops.txt (100%) rename code/tools/{q3asm => asm}/opstrings.h (100%) rename code/tools/{q3asm => asm}/q3asm.c (100%) rename code/tools/{q3asm => asm}/q3asm.sln (100%) rename code/tools/{q3asm => asm}/q3asm.vcproj (100%) rename code/tools/{q3asm => asm}/qfiles.h (100%) diff --git a/code/tools/q3asm/Makefile b/code/tools/asm/Makefile similarity index 72% rename from code/tools/q3asm/Makefile rename to code/tools/asm/Makefile index 504bcdde..67bfbd48 100644 --- a/code/tools/q3asm/Makefile +++ b/code/tools/asm/Makefile @@ -11,3 +11,8 @@ q3asm: q3asm.c cmdlib.c clean: rm -f q3asm *~ *.o +install: default + install -s -m 0755 q3asm ../ + +uninstall: + -rm ../q3asm diff --git a/code/tools/q3asm/README.Id b/code/tools/asm/README.Id similarity index 100% rename from code/tools/q3asm/README.Id rename to code/tools/asm/README.Id diff --git a/code/tools/q3asm/cmdlib.c b/code/tools/asm/cmdlib.c similarity index 100% rename from code/tools/q3asm/cmdlib.c rename to code/tools/asm/cmdlib.c diff --git a/code/tools/q3asm/cmdlib.h b/code/tools/asm/cmdlib.h similarity index 100% rename from code/tools/q3asm/cmdlib.h rename to code/tools/asm/cmdlib.h diff --git a/code/tools/q3asm/lib.txt b/code/tools/asm/lib.txt similarity index 100% rename from code/tools/q3asm/lib.txt rename to code/tools/asm/lib.txt diff --git a/code/tools/q3asm/mathlib.h b/code/tools/asm/mathlib.h similarity index 100% rename from code/tools/q3asm/mathlib.h rename to code/tools/asm/mathlib.h diff --git a/code/tools/q3asm/notes.txt b/code/tools/asm/notes.txt similarity index 100% rename from code/tools/q3asm/notes.txt rename to code/tools/asm/notes.txt diff --git a/code/tools/q3asm/ops.txt b/code/tools/asm/ops.txt similarity index 100% rename from code/tools/q3asm/ops.txt rename to code/tools/asm/ops.txt diff --git a/code/tools/q3asm/opstrings.h b/code/tools/asm/opstrings.h similarity index 100% rename from code/tools/q3asm/opstrings.h rename to code/tools/asm/opstrings.h diff --git a/code/tools/q3asm/q3asm.c b/code/tools/asm/q3asm.c similarity index 100% rename from code/tools/q3asm/q3asm.c rename to code/tools/asm/q3asm.c diff --git a/code/tools/q3asm/q3asm.sln b/code/tools/asm/q3asm.sln similarity index 100% rename from code/tools/q3asm/q3asm.sln rename to code/tools/asm/q3asm.sln diff --git a/code/tools/q3asm/q3asm.vcproj b/code/tools/asm/q3asm.vcproj similarity index 100% rename from code/tools/q3asm/q3asm.vcproj rename to code/tools/asm/q3asm.vcproj diff --git a/code/tools/q3asm/qfiles.h b/code/tools/asm/qfiles.h similarity index 100% rename from code/tools/q3asm/qfiles.h rename to code/tools/asm/qfiles.h diff --git a/code/tools/lcc/makefile b/code/tools/lcc/makefile index 26efed4b..178e86c3 100644 --- a/code/tools/lcc/makefile +++ b/code/tools/lcc/makefile @@ -231,22 +231,14 @@ testclean: $(RM) $Tyacc$E $Tyacc.s $Tyacc.2 $Tyacc.1 install:: all - install -d /usr/local/lib/lcc - install -d /usr/local/lib/lcc/gcc - install $Bq3lcc$E /usr/local/bin - install $Bq3cpp$E /usr/local/lib/lcc/gcc - install $Bq3rcc$E /usr/local/lib/lcc - install $Bliblcc$A /usr/local/lib/lcc - install $Blibrcc$A /usr/local/lib/lcc + install -s -m 0755 $Bq3lcc$E ../ + install -s -m 0755 $Bq3cpp$E ../ + install -s -m 0755 $Bq3rcc$E ../ uninstall:: - $(RM) /usr/local/lib/lcc/librcc$A - $(RM) /usr/local/lib/lcc/liblcc$A - $(RM) /usr/local/lib/lcc/q3rcc$E - $(RM) /usr/local/lib/lcc/gcc/q3cpp$E - $(RM) /usr/local/bin/lcc$E - $(RMDIR) /usr/local/lib/lcc/gcc - $(RMDIR) /usr/local/lib/lcc + -$(RM) ../q3lcc$E + -$(RM) ../q3cpp$E + -$(RM) ../q3rcc$E clean:: testclean $(RM) $B*$O