use opset/optab in adb

[unix-history] / usr / src / old / sdb / Makefile

diff --git a/usr/src/old/sdb/Makefile b/usr/src/old/sdb/Makefile
index ccd9108..6237865 100644 (file)
--- a/usr/src/old/sdb/Makefile
+++ b/usr/src/old/sdb/Makefile
@@ -1,5 +1,5 @@
 #
 #

-#      sdb     Makefile        4.3     %G%
+#      sdb     Makefile        4.4     %G%

 #
 # Conditional compilation flags:
 #      SDB     this is sdb
 #
 # Conditional compilation flags:
 #      SDB     this is sdb


@@ -13,28 +13,46 @@
 #
 CFLAGS=        -R -DSDB -DVMUNIX -DVFORK -DFLEXNAMES
 
 #
 CFLAGS=        -R -DSDB -DVMUNIX -DVFORK -DFLEXNAMES
 

+ADB = /usr/src/bin/adb
+AS = /usr/src/bin/as
+SHARE = $(ADB)
+

 SRCS=  access.c decode.c display.c docomm.c fio.c main.c message.c \
 SRCS=  access.c decode.c display.c docomm.c fio.c main.c message.c \

-       old.c ../adb/opset.c ../adb/optab.c pcs.c prvar.c re.c runpcs.c \
-       setup.c sub.c symt.c udef.c version.c xeq.c
+       old.c $(SHARE)/opset.c $(SHARE)/optab.c pcs.c prvar.c re.c runpcs.c \
+       setup.c sub.c symt.c udef.c version.c xeq.c reginit.c

 OBJS=  access.o decode.o display.o docomm.o fio.o main.o message.o \
        old.o opset.o optab.o pcs.o prvar.o re.o runpcs.o \
 OBJS=  access.o decode.o display.o docomm.o fio.o main.o message.o \
        old.o opset.o optab.o pcs.o prvar.o re.o runpcs.o \

-       setup.o sub.o symt.o udef.o version.o xeq.o
+       setup.o sub.o symt.o udef.o version.o xeq.o reginit.o

 HDRS=  cdefs.h defs.h head.h mac.h machine.h mode.h old.h
 
 sdb: sources ${OBJS}
        cc -o sdb *.o
 
 HDRS=  cdefs.h defs.h head.h mac.h machine.h mode.h old.h
 
 sdb: sources ${OBJS}
        cc -o sdb *.o
 

-opset.o: ../adb/opset.c
-       $(CC) $(CFLAGS) -c ../adb/opset.c
-optab.o: ../adb/optab.c ../adb/instrs.adb
-       $(CC) $(CFLAGS) -c ../adb/optab.c
-../adb/instrs.adb: ../as/instrs
-       (cd ../adb; make instrs.adb)
+#
+#      An apparent bug in /lib/cpp prevents us from compiling
+#      directly from $(SHARE)/{opset,optab}.c; the wrong
+#      version of head.h is included (cpp gets $(SHARE)/head.h;
+#      we want head.h).  Consequently, the copy
+#
+opset.c: $(SHARE)/opset.c
+       cp $(SHARE)/opset.c opset.c
+optab.c: $(SHARE)/optab.c
+       cp $(SHARE)/optab.c optab.c
+instrs.adb: $(SHARE)/instrs.adb
+       cp $(SHARE)/instrs.adb instrs.adb
+#
+#      Now, compile them
+#
+opset.o: opset.c
+       $(CC) -I. -I$(AS) $(CFLAGS) -c opset.c
+optab.o: optab.c instrs.adb
+       $(CC) -I. -I$(AS) $(CFLAGS) -c optab.c
+$(SHARE)/instrs.adb: $(AS)/instrs
+       cd $(SHARE); make instrs.adb

 install:
        cp sdb sdb.temp
        install -s sdb $(DESTDIR)/usr/bin
        mv sdb.temp sdb
 install:
        cp sdb sdb.temp
        install -s sdb $(DESTDIR)/usr/bin
        mv sdb.temp sdb

-

 clean:
        rm -f *.o sdb
 
 clean:
        rm -f *.o sdb