Browse Source

Changed #include's

ceriel 33 years ago
parent
commit
27d53b0d33

+ 9 - 18
util/ego/il/Makefile

@@ -1,11 +1,10 @@
-
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -70,14 +69,12 @@ depend:
 
 # the next lines are generated automatically
 # AUTOAUTOAUTOAUTOAUTOAUTO
-
-il.o:	../../../h/em_mnem.h
-il.o:	../../../h/em_pseu.h
 il.o:	../share/alloc.h
 il.o:	../share/debug.h
 il.o:	../share/files.h
 il.o:	../share/get.h
 il.o:	../share/global.h
+il.o:	../share/go.h
 il.o:	../share/lset.h
 il.o:	../share/map.h
 il.o:	../share/put.h
@@ -86,9 +83,9 @@ il.o:	il.h
 il.o:	il1_anal.h
 il.o:	il2_aux.h
 il.o:	il3_subst.h
-il1_anal.o:	../../../h/em_mnem.h
-il1_anal.o:	../../../h/em_pseu.h
+il.o:	il_aux.h
 il1_anal.o:	../share/alloc.h
+il1_anal.o:	../share/aux.h
 il1_anal.o:	../share/debug.h
 il1_anal.o:	../share/global.h
 il1_anal.o:	../share/lset.h
@@ -100,7 +97,6 @@ il1_anal.o:	il1_aux.h
 il1_anal.o:	il1_cal.h
 il1_anal.o:	il1_formal.h
 il1_anal.o:	il_aux.h
-il1_aux.o:	../../../h/em_spec.h
 il1_aux.o:	../share/alloc.h
 il1_aux.o:	../share/debug.h
 il1_aux.o:	../share/global.h
@@ -109,8 +105,6 @@ il1_aux.o:	../share/types.h
 il1_aux.o:	il.h
 il1_aux.o:	il1_aux.h
 il1_aux.o:	il_aux.h
-il1_cal.o:	../../../h/em_mnem.h
-il1_cal.o:	../../../h/em_spec.h
 il1_cal.o:	../share/alloc.h
 il1_cal.o:	../share/debug.h
 il1_cal.o:	../share/global.h
@@ -128,9 +122,8 @@ il1_formal.o:	../share/types.h
 il1_formal.o:	il.h
 il1_formal.o:	il1_aux.h
 il1_formal.o:	il1_formal.h
-il2_aux.o:	../../../h/em_mnem.h
-il2_aux.o:	../../../h/em_spec.h
 il2_aux.o:	../share/alloc.h
+il2_aux.o:	../share/aux.h
 il2_aux.o:	../share/debug.h
 il2_aux.o:	../share/get.h
 il2_aux.o:	../share/global.h
@@ -146,11 +139,8 @@ il3_aux.o:	../share/types.h
 il3_aux.o:	il.h
 il3_aux.o:	il3_aux.h
 il3_aux.o:	il_aux.h
-il3_change.o:	../../../h/em_mes.h
-il3_change.o:	../../../h/em_mnem.h
-il3_change.o:	../../../h/em_pseu.h
-il3_change.o:	../../../h/em_spec.h
 il3_change.o:	../share/alloc.h
+il3_change.o:	../share/aux.h
 il3_change.o:	../share/debug.h
 il3_change.o:	../share/def.h
 il3_change.o:	../share/get.h
@@ -162,7 +152,6 @@ il3_change.o:	il.h
 il3_change.o:	il3_aux.h
 il3_change.o:	il3_change.h
 il3_change.o:	il_aux.h
-il3_subst.o:	../../../h/em_mnem.h
 il3_subst.o:	../share/alloc.h
 il3_subst.o:	../share/debug.h
 il3_subst.o:	../share/get.h
@@ -173,12 +162,14 @@ il3_subst.o:	il.h
 il3_subst.o:	il3_aux.h
 il3_subst.o:	il3_change.h
 il3_subst.o:	il3_subst.h
-il_aux.o:	../../../h/em_spec.h
+il3_subst.o:	il_aux.h
 il_aux.o:	../share/alloc.h
 il_aux.o:	../share/debug.h
+il_aux.o:	../share/get.h
 il_aux.o:	../share/global.h
 il_aux.o:	../share/lset.h
 il_aux.o:	../share/map.h
+il_aux.o:	../share/put.h
 il_aux.o:	../share/types.h
 il_aux.o:	il.h
 il_aux.o:	il_aux.h

+ 23 - 10
util/ego/il/il.c

@@ -5,6 +5,9 @@
  */
 /*  I N L I N E   S U B S T I T U T I O N */
 #include <stdio.h>
+#include <em_path.h>
+#include <em_mnem.h>
+#include <em_pseu.h>
 #include "../share/types.h"
 #include "il.h"
 #include "../share/debug.h"
@@ -12,8 +15,6 @@
 #include "../share/global.h"
 #include "../share/lset.h"
 #include "../share/files.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
 #include "../share/map.h"
 #include "il_aux.h"
 #include "il1_anal.h"
@@ -29,11 +30,12 @@ calcnt_p cchead;	/* call-count info of current proc */
 STATIC long space = 0;
 STATIC long total_size = 0;
 
-STATIC char cname[] = "/usr/tmp/ego.i1.XXXXXX";
-STATIC char ccname[] = "/usr/tmp/ego.i2.XXXXXX";
+STATIC char cname[128] = TMP_DIR;
+STATIC char ccname[128] = TMP_DIR;
 
 /* For debugging only */
-STATIC char sname[] = "/usr/tmp/ego.i3.XXXXXX";
+STATIC char sname[128] = TMP_DIR;
+STATIC int kp_temps = 0;
 
 int Ssubst;
 #ifdef VERBOSE
@@ -118,7 +120,7 @@ pass1(lnam,bnam,cnam)
 
 
 
-STATIC char cname2[] = "/usr/tmp/ego.i4.XXXXXX";
+STATIC char cname2[128] = TMP_DIR;
 
 pass2(cnam,space)
 	char *cnam;
@@ -145,14 +147,14 @@ pass2(cnam,space)
 		}
 	}
 	select_calls(fproc,ccf,space);
-	fclose(cf); unlink(cnam);
+	fclose(cf); if (! kp_temps) unlink(cnam);
 	fclose(cf2);
-	fclose(ccf); unlink(ccname);
+	fclose(ccf); if (! kp_temps) unlink(ccname);
 	cf2 = openfile(cname2,"r");
 	add_actuals(fproc,cf2);
 	cleancals(fproc); /* remove calls that were not selected */
 	/* add actual parameters to each selected call */
-	fclose(cf2); unlink(cname2);
+	fclose(cf2); if (! kp_temps) unlink(cname2);
 }
 
 
@@ -219,7 +221,7 @@ pass3(lnam,lnam2)
 	fclose(lfile2);
 	if (verbose) {
 		fclose(sfile);
-		unlink(sname);
+		if (! kp_temps) unlink(sname);
 	}
 }
 
@@ -289,6 +291,13 @@ il_flags(p)
 	case 'a':
 		complete_program = 1;
 		break;
+	case 't':
+		strcpy(cname, ".");
+		strcpy(ccname, ".");
+		strcpy(sname, ".");
+		strcpy(cname2, ".");
+		kp_temps = 1;
+		break;
 	}
 }
 
@@ -300,6 +309,10 @@ main(argc,argv)
 	
 	go(argc,argv,no_action,no_action,no_action,il_flags);
 	il_extptab(fproc); /* add extended data structures */
+	strcat(cname, "/ego.i1.XXXXXX");
+	strcat(ccname, "/ego.i2.XXXXXX");
+	strcat(sname, "/ego.i3.XXXXXX");
+	strcat(cname2, "/ego.i4.XXXXXX");
 	mktemp(cname);
 	mktemp(ccname);
 	mktemp(sname);

+ 2 - 2
util/ego/il/il1_anal.c

@@ -9,6 +9,8 @@
  */
 
 #include <stdio.h>
+#include <em_mnem.h>
+#include <em_pseu.h>
 #include "../share/types.h"
 #include "il.h"
 #include "../share/debug.h"
@@ -16,8 +18,6 @@
 #include "../share/global.h"
 #include "../share/lset.h"
 #include "../share/aux.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
 #include "il1_aux.h"
 #include "il1_formal.h"
 #include "il1_cal.h"

+ 1 - 1
util/ego/il/il1_aux.c

@@ -8,13 +8,13 @@
  *  I L 1 _ A U X . C
  */
 
+#include <em_spec.h>
 #include "../share/types.h"
 #include "il.h"
 #include "../share/debug.h"
 #include "../share/alloc.h"
 #include "../share/global.h"
 #include "../share/lset.h"
-#include "../../../h/em_spec.h"
 #include "il_aux.h"
 #include "il1_aux.h"
 

+ 2 - 2
util/ego/il/il1_cal.c

@@ -9,6 +9,8 @@
  */
 
 #include <stdio.h>
+#include <em_spec.h>
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "il.h"
 #include "il1_cal.h"
@@ -16,8 +18,6 @@
 #include "../share/alloc.h"
 #include "../share/global.h"
 #include "../share/lset.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_mnem.h"
 #include "il1_aux.h"
 #include "../share/parser.h"
 

+ 2 - 2
util/ego/il/il2_aux.c

@@ -9,14 +9,14 @@
  */
 
 #include <stdio.h>
+#include <em_spec.h>
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "il.h"
 #include "../share/debug.h"
 #include "../share/alloc.h"
 #include "../share/global.h"
 #include "../share/lset.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_mnem.h"
 #include "il_aux.h"
 #include "il2_aux.h"
 #include "../share/get.h"

+ 4 - 4
util/ego/il/il3_change.c

@@ -10,6 +10,10 @@
 
 
 #include <stdio.h>
+#include <em_mnem.h>
+#include <em_pseu.h>
+#include <em_spec.h>
+#include <em_mes.h>
 #include "../share/types.h"
 #include "il.h"
 #include "../share/debug.h"
@@ -18,10 +22,6 @@
 #include "../share/def.h"
 #include "../share/lset.h"
 #include "../share/aux.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_mes.h"
 #include "../share/get.h"
 #include "../share/put.h"
 #include "il_aux.h"

+ 1 - 1
util/ego/il/il3_subst.c

@@ -9,6 +9,7 @@
  */
 
 #include <stdio.h>
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "il.h"
 #include "../share/debug.h"
@@ -16,7 +17,6 @@
 #include "../share/global.h"
 #include "../share/lset.h"
 #include "../share/get.h"
-#include "../../../h/em_mnem.h"
 #include "il_aux.h"
 #include "il3_aux.h"
 #include "il3_change.h"

+ 3 - 3
util/ego/il/il_aux.c

@@ -10,6 +10,9 @@
  */
 
 #include <stdio.h>
+#include <em_spec.h>
+#include <em_mnem.h>
+#include <em_pseu.h>
 #include "../share/types.h"
 #include "il.h"
 #include "../share/debug.h"
@@ -19,9 +22,6 @@
 #include "../share/global.h"
 #include "../share/lset.h"
 #include "../share/map.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
 #include "il_aux.h"
 
 

+ 1 - 6
util/ego/lv/Makefile

@@ -1,11 +1,10 @@
-
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -67,10 +66,6 @@ depend:
 
 # the next lines are generated automatically
 # AUTOAUTOAUTOAUTOAUTOAUTO
-
-lv.o:	../../../h/em_mnem.h
-lv.o:	../../../h/em_pseu.h
-lv.o:	../../../h/em_spec.h
 lv.o:	../share/alloc.h
 lv.o:	../share/aux.h
 lv.o:	../share/cset.h

+ 5 - 5
util/ego/lv/lv.c

@@ -7,6 +7,11 @@
 /* L I V E   V A R I A B L E S   A N A L Y S I S */
 
 #include <stdio.h>
+#include <em_mnem.h>
+#include <em_pseu.h>
+#include <em_spec.h>
+#include <em_mes.h>
+#include <em_ego.h>
 #include "../share/types.h"
 #include "lv.h"
 #include "../share/debug.h"
@@ -23,11 +28,6 @@
 #include "../share/init_glob.h"
 #include "../share/locals.h"
 #include "../share/go.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_mes.h"
-#include "../../../h/em_ego.h"
 #include "../share/parser.h"
 
 #define newlvbx()	(bext_p) newstruct(bext_lv)

+ 1 - 28
util/ego/ra/Makefile

@@ -1,11 +1,10 @@
-
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -76,8 +75,6 @@ depend:
 
 # the next lines are generated automatically
 # AUTOAUTOAUTOAUTOAUTOAUTO
-
-ra.o:	../../../h/em_reg.h
 ra.o:	../share/alloc.h
 ra.o:	../share/debug.h
 ra.o:	../share/files.h
@@ -94,10 +91,6 @@ ra.o:	ra_items.h
 ra.o:	ra_pack.h
 ra.o:	ra_profits.h
 ra.o:	ra_xform.h
-ra_allocl.o:	../../../h/em_mnem.h
-ra_allocl.o:	../../../h/em_pseu.h
-ra_allocl.o:	../../../h/em_reg.h
-ra_allocl.o:	../../../h/em_spec.h
 ra_allocl.o:	../share/alloc.h
 ra_allocl.o:	../share/aux.h
 ra_allocl.o:	../share/cset.h
@@ -112,10 +105,6 @@ ra_allocl.o:	ra_allocl.h
 ra_allocl.o:	ra_aux.h
 ra_allocl.o:	ra_interv.h
 ra_allocl.o:	ra_items.h
-ra_aux.o:	../../../h/em_mnem.h
-ra_aux.o:	../../../h/em_pseu.h
-ra_aux.o:	../../../h/em_reg.h
-ra_aux.o:	../../../h/em_spec.h
 ra_aux.o:	../share/alloc.h
 ra_aux.o:	../share/debug.h
 ra_aux.o:	../share/def.h
@@ -129,13 +118,8 @@ ra_interv.o:	../share/debug.h
 ra_interv.o:	../share/global.h
 ra_interv.o:	../share/lset.h
 ra_interv.o:	../share/types.h
-ra_interv.o:	../../../h/em_reg.h
 ra_interv.o:	ra.h
 ra_interv.o:	ra_interv.h
-ra_items.o:	../../../h/em_mnem.h
-ra_items.o:	../../../h/em_pseu.h
-ra_items.o:	../../../h/em_reg.h
-ra_items.o:	../../../h/em_spec.h
 ra_items.o:	../share/alloc.h
 ra_items.o:	../share/aux.h
 ra_items.o:	../share/debug.h
@@ -147,10 +131,6 @@ ra_items.o:	itemtab.h
 ra_items.o:	ra.h
 ra_items.o:	ra_aux.h
 ra_items.o:	ra_items.h
-ra_lifet.o:	../../../h/em_mnem.h
-ra_lifet.o:	../../../h/em_pseu.h
-ra_lifet.o:	../../../h/em_reg.h
-ra_lifet.o:	../../../h/em_spec.h
 ra_lifet.o:	../share/alloc.h
 ra_lifet.o:	../share/aux.h
 ra_lifet.o:	../share/debug.h
@@ -162,7 +142,6 @@ ra_lifet.o:	ra.h
 ra_lifet.o:	ra_aux.h
 ra_lifet.o:	ra_items.h
 ra_lifet.o:	ra_lifet.h
-ra_pack.o:	../../../h/em_reg.h
 ra_pack.o:	../share/alloc.h
 ra_pack.o:	../share/aux.h
 ra_pack.o:	../share/cset.h
@@ -174,7 +153,6 @@ ra_pack.o:	../share/types.h
 ra_pack.o:	ra.h
 ra_pack.o:	ra_aux.h
 ra_pack.o:	ra_interv.h
-ra_profits.o:	../../../h/em_reg.h
 ra_profits.o:	../share/debug.h
 ra_profits.o:	../share/global.h
 ra_profits.o:	../share/lset.h
@@ -182,11 +160,6 @@ ra_profits.o:	../share/types.h
 ra_profits.o:	ra.h
 ra_profits.o:	ra_aux.h
 ra_profits.o:	ra_profits.h
-ra_xform.o:	../../../h/em_mes.h
-ra_xform.o:	../../../h/em_mnem.h
-ra_xform.o:	../../../h/em_pseu.h
-ra_xform.o:	../../../h/em_reg.h
-ra_xform.o:	../../../h/em_spec.h
 ra_xform.o:	../share/alloc.h
 ra_xform.o:	../share/aux.h
 ra_xform.o:	../share/debug.h

+ 1 - 1
util/ego/ra/ra.c

@@ -9,6 +9,7 @@
  */
 
 #include <stdio.h>
+#include <em_reg.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/global.h"
@@ -19,7 +20,6 @@
 #include "../share/map.h"
 #include "../share/alloc.h"
 #include "../share/go.h"
-#include "../../../h/em_reg.h"
 #include "ra.h"
 #include "ra_items.h"
 #include "ra_allocl.h"

+ 4 - 4
util/ego/ra/ra_allocl.c

@@ -8,6 +8,10 @@
  *  R A _ A L L O C L I S T . C
  */
 
+#include <em_mnem.h>
+#include <em_spec.h>
+#include <em_pseu.h>
+#include <em_reg.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/def.h"
@@ -17,10 +21,6 @@
 #include "../share/aux.h"
 #include "../share/alloc.h"
 #include "../share/map.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_reg.h"
 #include "ra.h"
 #include "ra_aux.h"
 #include "ra_items.h"

+ 4 - 4
util/ego/ra/ra_aux.c

@@ -8,16 +8,16 @@
  *  A U X I L I A R Y   R O U T I N E S
  */
 
+#include <em_mnem.h>
+#include <em_spec.h>
+#include <em_pseu.h>
+#include <em_reg.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/def.h"
 #include "../share/global.h"
 #include "../share/lset.h"
 #include "../share/alloc.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_reg.h"
 #include "ra.h"
 #include "ra_aux.h"
 

+ 1 - 1
util/ego/ra/ra_interv.c

@@ -9,12 +9,12 @@
  */
 
 
+#include <em_reg.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/global.h"
 #include "../share/alloc.h"
 #include "../share/lset.h"
-#include "../../../h/em_reg.h"
 #include "ra.h"
 #include "ra_interv.h"
 

+ 4 - 4
util/ego/ra/ra_items.c

@@ -8,6 +8,10 @@
  *  R A _ I T E M S . C
  */
 
+#include <em_mnem.h>
+#include <em_spec.h>
+#include <em_pseu.h>
+#include <em_reg.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/def.h"
@@ -15,10 +19,6 @@
 #include "../share/lset.h"
 #include "../share/aux.h"
 #include "../share/alloc.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_reg.h"
 #include "ra.h"
 #include "ra_aux.h"
 #include "ra_items.h"

+ 6 - 6
util/ego/ra/ra_lifet.c

@@ -8,6 +8,12 @@
  *  R A _ L I F E T I M E . C
  */
 
+#include <em_mnem.h>
+#include <em_spec.h>
+#include <em_pseu.h>
+#include <em_reg.h>
+#include <em_mes.h>
+#include <em_ego.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/def.h"
@@ -15,12 +21,6 @@
 #include "../share/lset.h"
 #include "../share/aux.h"
 #include "../share/alloc.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_reg.h"
-#include "../../../h/em_mes.h"
-#include "../../../h/em_ego.h"
 #include "ra.h"
 #include "ra_aux.h"
 #include "ra_items.h"

+ 1 - 1
util/ego/ra/ra_pack.c

@@ -8,6 +8,7 @@
  *  R A _ P A C K . C
  */
 
+#include <em_reg.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/def.h"
@@ -16,7 +17,6 @@
 #include "../share/cset.h"
 #include "../share/alloc.h"
 #include "../share/aux.h"
-#include "../../../h/em_reg.h"
 #include "ra.h"
 #include "ra_aux.h"
 #include "ra_interv.h"

+ 1 - 1
util/ego/ra/ra_profits.c

@@ -9,11 +9,11 @@
  */
 
 #include <stdio.h>
+#include <em_reg.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/lset.h"
 #include "../share/global.h"
-#include "../../../h/em_reg.h"
 #include "ra.h"
 #include "ra_aux.h"
 #include "ra_profits.h"

+ 6 - 6
util/ego/ra/ra_xform.c

@@ -8,6 +8,12 @@
  *  R A _ X F O R M . C
  */
 
+#include <em_mnem.h>
+#include <em_spec.h>
+#include <em_pseu.h>
+#include <em_mes.h>
+#include <em_ego.h>
+#include <em_reg.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/def.h"
@@ -15,12 +21,6 @@
 #include "../share/lset.h"
 #include "../share/aux.h"
 #include "../share/alloc.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_mes.h"
-#include "../../../h/em_ego.h"
-#include "../../../h/em_reg.h"
 #include "ra.h"
 #include "ra_interv.h"
 #include "ra_xform.h"

+ 30 - 152
util/ego/share/Makefile

@@ -1,10 +1,10 @@
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
-SHARE=../share
+SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -90,29 +90,22 @@ depend:
 alloc.o:	alloc.h
 alloc.o:	debug.h
 alloc.o:	types.h
-aux.o:	../../../h/em_mes.h
-aux.o:	../../../h/em_pseu.h
-aux.o:	../share/alloc.h
-aux.o:	../share/aux.h
-aux.o:	../share/debug.h
-aux.o:	../share/global.h
-aux.o:	../share/map.h
-aux.o:	../share/types.h
+aux.o:	alloc.h
+aux.o:	aux.h
+aux.o:	debug.h
+aux.o:	global.h
+aux.o:	lset.h
+aux.o:	map.h
+aux.o:	types.h
 cset.o:	alloc.h
 cset.o:	cset.h
 cset.o:	debug.h
 cset.o:	global.h
 cset.o:	types.h
-debug.o:	../../../h/em_spec.h
 debug.o:	debug.h
 debug.o:	def.h
 debug.o:	global.h
 debug.o:	types.h
-get.o:	../../../h/em_flag.h
-get.o:	../../../h/em_mes.h
-get.o:	../../../h/em_mnem.h
-get.o:	../../../h/em_pseu.h
-get.o:	../../../h/em_spec.h
 get.o:	alloc.h
 get.o:	aux.h
 get.o:	cset.h
@@ -124,24 +117,21 @@ get.o:	lset.h
 get.o:	map.h
 get.o:	types.h
 global.o:	types.h
-go.o:	../share/alloc.h
-go.o:	../share/debug.h
-go.o:	../share/files.h
-go.o:	../share/get.h
-go.o:	../share/global.h
-go.o:	../share/lset.h
-go.o:	../share/map.h
-go.o:	../share/put.h
-go.o:	../share/types.h
-init_glob.o:	../share/alloc.h
-init_glob.o:	../share/debug.h
-init_glob.o:	../share/global.h
-init_glob.o:	../share/map.h
-init_glob.o:	../share/types.h
-locals.o:	../../../h/em_mes.h
-locals.o:	../../../h/em_mnem.h
-locals.o:	../../../h/em_pseu.h
-locals.o:	../../../h/em_spec.h
+go.o:	alloc.h
+go.o:	debug.h
+go.o:	files.h
+go.o:	get.h
+go.o:	global.h
+go.o:	go.h
+go.o:	lset.h
+go.o:	map.h
+go.o:	put.h
+go.o:	types.h
+init_glob.o:	alloc.h
+init_glob.o:	debug.h
+init_glob.o:	global.h
+init_glob.o:	map.h
+init_glob.o:	types.h
 locals.o:	alloc.h
 locals.o:	aux.h
 locals.o:	cset.h
@@ -158,8 +148,6 @@ lset.o:	lset.h
 lset.o:	types.h
 map.o:	map.h
 map.o:	types.h
-parser.o:	../../../h/em_mnem.h
-parser.o:	../../../h/em_spec.h
 parser.o:	alloc.h
 parser.o:	aux.h
 parser.o:	classdefs.h
@@ -167,8 +155,6 @@ parser.o:	debug.h
 parser.o:	global.h
 parser.o:	lset.h
 parser.o:	types.h
-put.o:	../../../h/em_pseu.h
-put.o:	../../../h/em_spec.h
 put.o:	alloc.h
 put.o:	debug.h
 put.o:	def.h
@@ -177,118 +163,10 @@ put.o:	lset.h
 put.o:	map.h
 put.o:	put.h
 put.o:	types.h
-show.o:	../../../h/em_flag.h
-show.o:	../../../h/em_pseu.h
-show.o:	../../../h/em_spec.h
-show.o:	../share/def.h
-show.o:	../share/global.h
-show.o:	../share/types.h
-stack_chg.o:	../share/debug.h
-stack_chg.o:	../share/global.h
-stack_chg.o:	../share/types.h
-stack_chg.o:	../../../h/em_mnem.h
-stack_chg.o:	../../../h/em_spec.h
+show.o:	def.h
+show.o:	global.h
+show.o:	types.h
+stack_chg.o:	debug.h
+stack_chg.o:	global.h
 stack_chg.o:	pop_push.h
-
-alloc.m:	alloc.h
-alloc.m:	debug.h
-alloc.m:	types.h
-aux.m:	../../../h/em_mes.h
-aux.m:	../../../h/em_pseu.h
-aux.m:	../share/alloc.h
-aux.m:	../share/aux.h
-aux.m:	../share/debug.h
-aux.m:	../share/global.h
-aux.m:	../share/map.h
-aux.m:	../share/types.h
-cset.m:	alloc.h
-cset.m:	cset.h
-cset.m:	debug.h
-cset.m:	global.h
-cset.m:	types.h
-debug.m:	../../../h/em_spec.h
-debug.m:	debug.h
-debug.m:	def.h
-debug.m:	global.h
-debug.m:	types.h
-get.m:	../../../h/em_flag.h
-get.m:	../../../h/em_mes.h
-get.m:	../../../h/em_mnem.h
-get.m:	../../../h/em_pseu.h
-get.m:	../../../h/em_spec.h
-get.m:	alloc.h
-get.m:	aux.h
-get.m:	cset.h
-get.m:	debug.h
-get.m:	def.h
-get.m:	get.h
-get.m:	global.h
-get.m:	lset.h
-get.m:	map.h
-get.m:	types.h
-global.m:	types.h
-go.m:	../share/alloc.h
-go.m:	../share/debug.h
-go.m:	../share/files.h
-go.m:	../share/get.h
-go.m:	../share/global.h
-go.m:	../share/lset.h
-go.m:	../share/map.h
-go.m:	../share/put.h
-go.m:	../share/types.h
-init_glob.m:	../share/alloc.h
-init_glob.m:	../share/debug.h
-init_glob.m:	../share/global.h
-init_glob.m:	../share/map.h
-init_glob.m:	../share/types.h
-locals.m:	../../../h/em_mes.h
-locals.m:	../../../h/em_mnem.h
-locals.m:	../../../h/em_pseu.h
-locals.m:	../../../h/em_spec.h
-locals.m:	alloc.h
-locals.m:	aux.h
-locals.m:	cset.h
-locals.m:	debug.h
-locals.m:	def.h
-locals.m:	get.h
-locals.m:	global.h
-locals.m:	locals.h
-locals.m:	lset.h
-locals.m:	types.h
-lset.m:	alloc.h
-lset.m:	debug.h
-lset.m:	lset.h
-lset.m:	types.h
-map.m:	map.h
-map.m:	types.h
-parser.m:	../../../h/em_mnem.h
-parser.m:	../../../h/em_spec.h
-parser.m:	alloc.h
-parser.m:	aux.h
-parser.m:	classdefs.h
-parser.m:	debug.h
-parser.m:	global.h
-parser.m:	lset.h
-parser.m:	types.h
-put.m:	../../../h/em_pseu.h
-put.m:	../../../h/em_spec.h
-put.m:	alloc.h
-put.m:	debug.h
-put.m:	def.h
-put.m:	global.h
-put.m:	lset.h
-put.m:	map.h
-put.m:	put.h
-put.m:	types.h
-show.m:	../../../h/em_flag.h
-show.m:	../../../h/em_pseu.h
-show.m:	../../../h/em_spec.h
-show.m:	../share/def.h
-show.m:	../share/global.h
-show.m:	../share/types.h
-stack_chg.m:	../share/debug.h
-stack_chg.m:	../share/global.h
-stack_chg.m:	../share/types.h
-stack_chg.m:	../../../h/em_mnem.h
-stack_chg.m:	../../../h/em_spec.h
-stack_chg.m:	pop_push.h
+stack_chg.o:	types.h

+ 9 - 9
util/ego/share/aux.c

@@ -9,15 +9,15 @@
  *
  */
 
-#include "../share/types.h"
-#include "../share/debug.h"
-#include "../share/global.h"
-#include "../share/alloc.h"
-#include "../share/aux.h"
-#include "../share/map.h"
-#include "../share/lset.h"
-#include "../../../h/em_mes.h"
-#include "../../../h/em_pseu.h"
+#include <em_mes.h>
+#include <em_pseu.h>
+#include "types.h"
+#include "debug.h"
+#include "global.h"
+#include "alloc.h"
+#include "aux.h"
+#include "map.h"
+#include "lset.h"
 
 offset off_set(lnp)
 	line_p lnp;

+ 1 - 1
util/ego/share/debug.c

@@ -10,10 +10,10 @@
 
 
 #include <stdio.h>
+#include <em_spec.h>
 #include "types.h"
 #include "def.h"
 #include "debug.h"
-#include "../../../h/em_spec.h"
 #include "global.h"
 
 

+ 4 - 4
util/ego/share/get.c

@@ -9,6 +9,10 @@
  */
 
 #include <stdio.h>
+#include <em_spec.h>
+#include <em_mnem.h>
+#include <em_pseu.h>
+#include <em_mes.h>
 #include "types.h"
 #include "def.h"
 #include "debug.h"
@@ -19,10 +23,6 @@
 #include "alloc.h"
 #include "map.h"
 #include "aux.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_mes.h"
 
 FILE *curinp;
 block_id lastbid;	/* block identifying number */

+ 5 - 5
util/ego/share/init_glob.c

@@ -10,11 +10,11 @@
  *
  */
 
-#include "../share/types.h"
-#include "../share/debug.h"
-#include "../share/global.h"
-#include "../share/alloc.h"
-#include "../share/map.h"
+#include "types.h"
+#include "debug.h"
+#include "global.h"
+#include "alloc.h"
+#include "map.h"
 
 
 extern short nrglobals;

+ 4 - 4
util/ego/share/locals.c

@@ -8,6 +8,10 @@
  */
 
 #include <stdio.h>
+#include <em_mnem.h>
+#include <em_spec.h>
+#include <em_pseu.h>
+#include <em_mes.h>
 #include "types.h"
 #include "debug.h"
 #include "global.h"
@@ -17,10 +21,6 @@
 #include "get.h"
 #include "aux.h"
 #include "alloc.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_mes.h"
 #include "locals.h"
 
 

+ 2 - 2
util/ego/share/parser.c

@@ -5,14 +5,14 @@
  */
 
 #include <stdio.h>
+#include <em_spec.h>
+#include <em_mnem.h>
 #include "types.h"
 #include "debug.h"
 #include "alloc.h"
 #include "global.h"
 #include "lset.h"
 #include "aux.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_mnem.h"
 
 struct class {
 	byte	src_class;

+ 2 - 2
util/ego/share/put.c

@@ -6,13 +6,13 @@
 /* P U T . C */
 
 #include <stdio.h>
+#include <em_pseu.h>
+#include <em_spec.h>
 #include "types.h"
 #include "global.h"
 #include "debug.h"
 #include "def.h"
 #include "map.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_spec.h"
 #include "lset.h"
 #include "alloc.h"
 #include "put.h"

+ 6 - 6
util/ego/share/show.c

@@ -14,12 +14,12 @@
 
 
 #include <stdio.h>
-#include "../../../h/em_spec.h"
-#include "../../../h/em_flag.h"
-#include "../../../h/em_pseu.h"
-#include "../share/types.h"
-#include "../share/def.h"
-#include "../share/global.h"
+#include <em_spec.h>
+#include <em_flag.h>
+#include <em_pseu.h>
+#include "types.h"
+#include "def.h"
+#include "global.h"
 
 
 #define BMASK 0377

+ 5 - 5
util/ego/share/stack_chg.c

@@ -7,11 +7,11 @@
 
 
 #include <stdio.h>
-#include "../share/types.h"
-#include "../share/debug.h"
-#include "../share/global.h"
-#include "../../../h/em_spec.h"
-#include "../../../h/em_mnem.h"
+#include <em_spec.h>
+#include <em_mnem.h>
+#include "types.h"
+#include "debug.h"
+#include "global.h"
 
 #include "pop_push.h"
 

+ 1 - 11
util/ego/sp/Makefile

@@ -1,11 +1,10 @@
-
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -66,7 +65,6 @@ depend:
 
 # the next lines are generated automatically
 # AUTOAUTOAUTOAUTOAUTOAUTO
-
 sp.o:	../share/alloc.h
 sp.o:	../share/aux.h
 sp.o:	../share/debug.h
@@ -79,11 +77,3 @@ sp.o:	../share/map.h
 sp.o:	../share/put.h
 sp.o:	../share/stack_chg.h
 sp.o:	../share/types.h
-sp.o:	../../../h/em_mnem.h
-sp.o:	../../../h/em_spec.h
-stack_chg.o:	../share/debug.h
-stack_chg.o:	../share/global.h
-stack_chg.o:	../share/types.h
-stack_chg.o:	../../../h/em_mnem.h
-stack_chg.o:	../../../h/em_spec.h
-stack_chg.o:	pop_push.h

+ 2 - 2
util/ego/sp/sp.c

@@ -10,6 +10,8 @@
 
 
 #include <stdio.h>
+#include <em_mnem.h>
+#include <em_spec.h>
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/global.h"
@@ -22,8 +24,6 @@
 #include "../share/aux.h"
 #include "../share/go.h"
 #include "../share/stack_chg.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_spec.h"
 
 
 /* Stack pollution throws away the ASP instructions after a procedure call.

+ 4 - 17
util/ego/sr/Makefile

@@ -1,11 +1,10 @@
-
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -67,12 +66,13 @@ depend:
 
 # the next lines are generated automatically
 # AUTOAUTOAUTOAUTOAUTOAUTO
-
 sr.o:	../share/alloc.h
+sr.o:	../share/aux.h
 sr.o:	../share/debug.h
 sr.o:	../share/files.h
 sr.o:	../share/get.h
 sr.o:	../share/global.h
+sr.o:	../share/go.h
 sr.o:	../share/lset.h
 sr.o:	../share/map.h
 sr.o:	../share/put.h
@@ -80,8 +80,6 @@ sr.o:	../share/types.h
 sr.o:	sr.h
 sr.o:	sr_aux.h
 sr.o:	sr_iv.h
-sr_aux.o:	../../../h/em_mnem.h
-sr_aux.o:	../../../h/em_pseu.h
 sr_aux.o:	../share/aux.h
 sr_aux.o:	../share/debug.h
 sr_aux.o:	../share/global.h
@@ -90,8 +88,6 @@ sr_aux.o:	../share/types.h
 sr_aux.o:	sr.h
 sr_aux.o:	sr_aux.h
 sr_aux.o:	sr_xform.h
-sr_cand.o:	../../../h/em_mnem.h
-sr_cand.o:	../../../h/em_pseu.h
 sr_cand.o:	../share/aux.h
 sr_cand.o:	../share/cset.h
 sr_cand.o:	../share/debug.h
@@ -102,7 +98,6 @@ sr_cand.o:	../share/types.h
 sr_cand.o:	sr.h
 sr_cand.o:	sr_aux.h
 sr_cand.o:	sr_cand.h
-sr_expr.o:	../../../h/em_mnem.h
 sr_expr.o:	../share/aux.h
 sr_expr.o:	../share/debug.h
 sr_expr.o:	../share/global.h
@@ -111,8 +106,6 @@ sr_expr.o:	../share/types.h
 sr_expr.o:	sr.h
 sr_expr.o:	sr_aux.h
 sr_expr.o:	sr_iv.h
-sr_iv.o:	../../../h/em_mnem.h
-sr_iv.o:	../../../h/em_pseu.h
 sr_iv.o:	../share/alloc.h
 sr_iv.o:	../share/aux.h
 sr_iv.o:	../share/cset.h
@@ -124,13 +117,10 @@ sr_iv.o:	sr.h
 sr_iv.o:	sr_aux.h
 sr_iv.o:	sr_cand.h
 sr_iv.o:	sr_iv.h
-sr_reduce.o:	../../../h/em_mes.h
-sr_reduce.o:	../../../h/em_mnem.h
-sr_reduce.o:	../../../h/em_pseu.h
-sr_reduce.o:	../../../h/em_reg.h
 sr_reduce.o:	../share/alloc.h
 sr_reduce.o:	../share/aux.h
 sr_reduce.o:	../share/debug.h
+sr_reduce.o:	../share/def.h
 sr_reduce.o:	../share/global.h
 sr_reduce.o:	../share/lset.h
 sr_reduce.o:	../share/types.h
@@ -139,9 +129,6 @@ sr_reduce.o:	sr_aux.h
 sr_reduce.o:	sr_expr.h
 sr_reduce.o:	sr_reduce.h
 sr_reduce.o:	sr_xform.h
-sr_xform.o:	../../../h/em_mnem.h
-sr_xform.o:	../../../h/em_pseu.h
-sr_xform.o:	../../../h/em_spec.h
 sr_xform.o:	../share/alloc.h
 sr_xform.o:	../share/aux.h
 sr_xform.o:	../share/debug.h

+ 2 - 2
util/ego/sr/sr_aux.c

@@ -10,11 +10,11 @@
  */
 
 
+#include <em_mnem.h>
+#include <em_pseu.h>
 #include "../share/types.h"
 #include "sr.h"
 #include "../share/debug.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
 #include "../share/global.h"
 #include "../share/lset.h"
 #include "../share/aux.h"

+ 2 - 2
util/ego/sr/sr_cand.c

@@ -9,9 +9,9 @@
  */
 
 
+#include <em_mnem.h>
+#include <em_pseu.h>
 #include "../share/types.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
 #include "../share/lset.h"
 #include "../share/cset.h"
 #include "../share/debug.h"

+ 1 - 1
util/ego/sr/sr_expr.c

@@ -11,6 +11,7 @@
 
 
 #include <stdio.h>
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "sr.h"
 #include "../share/debug.h"
@@ -19,7 +20,6 @@
 #include "sr_aux.h"
 #include "../share/lset.h"
 #include "sr_iv.h"
-#include "../../../h/em_mnem.h"
 
 
 

+ 2 - 2
util/ego/sr/sr_iv.c

@@ -10,10 +10,10 @@
  */
 
 
+#include <em_mnem.h>
+#include <em_pseu.h>
 #include "../share/types.h"
 #include "sr.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
 #include "../share/lset.h"
 #include "../share/cset.h"
 #include "../share/debug.h"

+ 5 - 6
util/ego/sr/sr_reduce.c

@@ -10,9 +10,13 @@
  */
 
 
+#include <em_pseu.h>
+#include <em_reg.h>
+#include <em_mes.h>
+#include <em_mnem.h>
+#include <em_spec.h>
 #include "../share/types.h"
 #include "sr.h"
-#include "../../../h/em_mnem.h"
 #include "../share/debug.h"
 #include "../share/alloc.h"
 #include "../share/def.h"
@@ -23,11 +27,6 @@
 #include "sr_xform.h"
 #include "sr_reduce.h"
 #include "sr_expr.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_reg.h"
-#include "../../../h/em_mes.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_spec.h"
 
 
 

+ 3 - 3
util/ego/sr/sr_xform.c

@@ -12,6 +12,9 @@
 
 
 #include <stdio.h>
+#include <em_mnem.h>
+#include <em_pseu.h>
+#include <em_spec.h>
 #include "../share/types.h"
 #include "sr.h"
 #include "../share/debug.h"
@@ -22,9 +25,6 @@
 #include "sr_aux.h"
 #include "../share/lset.h"
 #include "../share/aux.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_spec.h"
 #include "sr_xform.h"
 
 /* Transformations on EM texts */

+ 10 - 20
util/ego/ud/Makefile

@@ -1,11 +1,10 @@
-
 EMHOME=../../..
 EMH=$(EMHOME)/h
 EMLIB=$(EMHOME)/lib
 SHR=../share
 
 LDFLAGS=
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT
+CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH)
 CFLAGS=$(CPPFLAGS) -O
 LINTFLAGS=-hbu
 
@@ -67,9 +66,6 @@ depend:
 
 # the next lines are generated automatically
 # AUTOAUTOAUTOAUTOAUTOAUTO
-
-ud.o:	../../../h/em_pseu.h
-ud.o:	../../../h/em_spec.h
 ud.o:	../share/alloc.h
 ud.o:	../share/aux.h
 ud.o:	../share/cset.h
@@ -78,6 +74,8 @@ ud.o:	../share/def.h
 ud.o:	../share/files.h
 ud.o:	../share/get.h
 ud.o:	../share/global.h
+ud.o:	../share/go.h
+ud.o:	../share/init_glob.h
 ud.o:	../share/locals.h
 ud.o:	../share/lset.h
 ud.o:	../share/map.h
@@ -87,10 +85,8 @@ ud.o:	ud.h
 ud.o:	ud_const.h
 ud.o:	ud_copy.h
 ud.o:	ud_defs.h
-ud_aux.o:	../../../h/em_mnem.h
-ud_aux.o:	../../../h/em_pseu.h
-ud_aux.o:	../../../h/em_spec.h
 ud_aux.o:	../share/alloc.h
+ud_aux.o:	../share/aux.h
 ud_aux.o:	../share/cset.h
 ud_aux.o:	../share/debug.h
 ud_aux.o:	../share/def.h
@@ -98,11 +94,8 @@ ud_aux.o:	../share/global.h
 ud_aux.o:	../share/locals.h
 ud_aux.o:	../share/lset.h
 ud_aux.o:	../share/types.h
-ud_aux.o:	../ud/ud.h
-ud_aux.o:	../ud/ud_defs.h
-ud_const.o:	../../../h/em_mnem.h
-ud_const.o:	../../../h/em_pseu.h
-ud_const.o:	../../../h/em_spec.h
+ud_aux.o:	ud.h
+ud_aux.o:	ud_defs.h
 ud_const.o:	../share/alloc.h
 ud_const.o:	../share/aux.h
 ud_const.o:	../share/cset.h
@@ -112,13 +105,10 @@ ud_const.o:	../share/global.h
 ud_const.o:	../share/locals.h
 ud_const.o:	../share/lset.h
 ud_const.o:	../share/types.h
-ud_const.o:	../ud/ud.h
-ud_const.o:	../ud/ud_defs.h
+ud_const.o:	ud.h
 ud_const.o:	ud_aux.h
 ud_const.o:	ud_const.h
-ud_copy.o:	../../../h/em_mnem.h
-ud_copy.o:	../../../h/em_pseu.h
-ud_copy.o:	../../../h/em_spec.h
+ud_const.o:	ud_defs.h
 ud_copy.o:	../share/alloc.h
 ud_copy.o:	../share/aux.h
 ud_copy.o:	../share/cset.h
@@ -128,11 +118,11 @@ ud_copy.o:	../share/global.h
 ud_copy.o:	../share/locals.h
 ud_copy.o:	../share/lset.h
 ud_copy.o:	../share/types.h
-ud_copy.o:	../ud/ud.h
 ud_copy.o:	../ud/ud_defs.h
+ud_copy.o:	ud.h
 ud_copy.o:	ud_aux.h
+ud_copy.o:	ud_const.h
 ud_copy.o:	ud_copy.h
-ud_defs.o:	../../../h/em_mnem.h
 ud_defs.o:	../share/alloc.h
 ud_defs.o:	../share/aux.h
 ud_defs.o:	../share/cset.h

+ 1 - 1
util/ego/ud/ud.c

@@ -6,6 +6,7 @@
 /*  U S E  -  D E F I N I T I O N   A N A L Y S I S */
 
 #include <stdio.h>
+#include <em_spec.h>
 #include "../share/types.h"
 #include "ud.h"
 #include "../share/debug.h"
@@ -22,7 +23,6 @@
 #include "../share/init_glob.h"
 #include "../share/locals.h"
 #include "../share/go.h"
-#include "../../../h/em_spec.h"
 #include "ud_defs.h"
 #include "ud_const.h"
 #include "ud_copy.h"

+ 5 - 5
util/ego/ud/ud_aux.c

@@ -9,8 +9,11 @@
  */
 
 
+#include <em_mnem.h>
+#include <em_pseu.h>
+#include <em_spec.h>
 #include "../share/types.h"
-#include "../ud/ud.h"
+#include "ud.h"
 #include "../share/debug.h"
 #include "../share/global.h"
 #include "../share/alloc.h"
@@ -19,10 +22,7 @@
 #include "../share/def.h"
 #include "../share/locals.h"
 #include "../share/aux.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_spec.h"
-#include "../ud/ud_defs.h"
+#include "ud_defs.h"
 
 repl_line(old,new,b)
 	line_p old,new;

+ 3 - 3
util/ego/ud/ud_const.c

@@ -5,6 +5,9 @@
  */
 /* C O N S T A N T   P R O P A G A T I O N */
 
+#include <em_mnem.h>
+#include <em_pseu.h>
+#include <em_spec.h>
 #include "../share/types.h"
 #include "ud.h"
 #include "../share/debug.h"
@@ -15,9 +18,6 @@
 #include "../share/def.h"
 #include "../share/aux.h"
 #include "../share/locals.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_spec.h"
 #include "ud_defs.h"
 #include "ud_const.h"
 #include "ud_aux.h"

+ 4 - 4
util/ego/ud/ud_copy.c

@@ -5,8 +5,11 @@
  */
 /* C O P Y   P R O P A G A T I O N */
 
+#include <em_mnem.h>
+#include <em_pseu.h>
+#include <em_spec.h>
 #include "../share/types.h"
-#include "../ud/ud.h"
+#include "ud.h"
 #include "../share/debug.h"
 #include "../share/global.h"
 #include "../share/alloc.h"
@@ -15,9 +18,6 @@
 #include "../share/def.h"
 #include "../share/aux.h"
 #include "../share/locals.h"
-#include "../../../h/em_mnem.h"
-#include "../../../h/em_pseu.h"
-#include "../../../h/em_spec.h"
 #include "../ud/ud_defs.h"
 #include "ud_copy.h"
 #include "ud_const.h"

+ 1 - 1
util/ego/ud/ud_defs.c

@@ -9,6 +9,7 @@
  *  U D _ D E F S . C
  */
 
+#include <em_mnem.h>
 #include "../share/types.h"
 #include "ud.h"
 #include "../share/debug.h"
@@ -17,7 +18,6 @@
 #include "../share/cset.h"
 #include "../share/map.h"
 #include "../share/locals.h"
-#include "../../../h/em_mnem.h"
 #include "ud_defs.h"
 #include "../share/alloc.h"
 #include "../share/aux.h"