diff --git a/Makefile b/Makefile index fed6a77..fc32f24 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,9 @@ HEADERS = macrossTypes.h macrossGlobals.h # Macross is not 64-bit clean and it does a lot of silent downcasting # to simulate subclasses and uses int and void * interchangably a -# bunch. -CFLAGS=-m32 -Wno-int-conversion -Wno-incompatible-pointer-types +# bunch. gcc calls these the int-conversion and +# incompatible-pointer-types warnings. +CFLAGS=-m32 # If yacc is notionally present on a system, it's usually actually # bison in a compatibility mode. bison is available by name more often @@ -48,42 +49,6 @@ macross: $(OBJECTS) driver: driver.c cc $(CFLAGS) -o driver driver.c -update: .mark - kessel "(cd /u0/chip/macross; make macross >&errorfyle)" & - -install: macross - cp macross /u1/gg/bin/macross_tmp - strip /u1/gg/bin/macross_tmp - mv /u1/gg/bin/macross_$(PROC) /u1/gg/bin/macross_$(PROC).old - mv /u1/gg/bin/macross_tmp /u1/gg/bin/macross_$(PROC) - cp /u1/gg/bin/macross_$(PROC) /net/mycroft/u1/gg/bin - cp /u1/gg/bin/macross_$(PROC) /net/shem/u1/gg/bin - cp /u1/gg/bin/macross_$(PROC) /net/weyr/u1/gg/bin - -dinstall: driver - cp driver /u1/gg/bin/driver_tmp - strip /u1/gg/bin/driver_tmp - mv /u1/gg/bin/driver_tmp /u1/gg/bin/driver/macross - cp /u1/gg/bin/driver /net/mycroft/u1/gg/bin/macross - cp /u1/gg/bin/driver /net/shem/u1/gg/bin/macross - cp /u1/gg/bin/driver /net/weyr/u1/gg/bin/macross - -change: - rm *.o - rm *.tab.* - cp Makefile_68000 Makefile - -move: .mark - -.mark: $(SOURCES) - cp $? /net/kessel/u0/chip/macross - cp $? /net/kessel/u0/chip/macross/prof - cp $? opt - date >.mark - date >/net/kessel/u0/chip/macross/.mark - date >/net/kessel/u0/chip/macross/prof/.mark - date >opt/.mark - macrossTypes.h: operandDefs_$(PROC).h operandBody_$(PROC).h\ conditionDefs_$(PROC).h diff --git a/slinky/Makefile b/slinky/Makefile index aa566ff..4082250 100644 --- a/slinky/Makefile +++ b/slinky/Makefile @@ -8,7 +8,7 @@ SOURCES = builtins.c debugPrint.c errorStuff.c expr.c globals.c initialize.c\ instantiate.c link.c main.c map.c poke.c read.c relocate.c slinkyTables.c\ write.c slinkyExpressions.h slinkyGlobals.h slinkyTypes.h y.tab.h -CFLAGS=-O2 -m32 -Wno-int-conversion -Wno-incompatible-pointer-types # slinky is not 64 bit clean +CFLAGS= -m32 # slinky is not 64 bit clean .c.o: cc $(CFLAGS) -c $*.c @@ -19,30 +19,6 @@ CFLAGS=-O2 -m32 -Wno-int-conversion -Wno-incompatible-pointer-types # slinky is slinky: $(OBJECTS) cc $(CFLAGS) -g -o slinky $(OBJECTS) -update: .mark - kessel "(cd /u0/chip/macross/slinky; make slinky >&errorfyle)" & - -move: .mark - -.mark: $(SOURCES) -# cp $? /net/kessel/u0/chip/macross/slinky - cp $? /net/kessel/u0/chip/macross/slinky -# cp $? /net/kessel/u0/chip/macross/slinky/prof - cp $? /net/kessel/u0/chip/macross/slinky/prof - cp $? opt - date >.mark -# date >/net/kessel/u0/chip/macross/slinky/.mark - date >/net/kessel/u0/chip/macross/slinky/.mark -# date >/net/kessel/u0/chip/macross/slinky/prof/.mark - date >/net/kessel/u0/chip/macross/slinky/prof/.mark - date >opt/.mark - -install: slinky - cp slinky /u1/gg/bin/slinky_tmp - strip /u1/gg/bin/slinky_tmp - mv /u1/gg/bin/slinky /u1/gg/bin/sliny.old - mv /u1/gg/bin/slinky_tmp /u1/gg/bin/slinky - builtins.o: builtins.c slinkyGlobals.h slinkyTypes.h slinkyExpressions.h debugPrint.o: debugPrint.c slinkyGlobals.h slinkyTypes.h