many re-arrangements

modules/src/em_code/Makefile

@@ -1,9 +1,9 @@
 EMHOME = ../../..
 INSTALL = $(EMHOME)/modules/install
 COMPARE = $(EMHOME)/modules/compare
-INCORE = -DINCORE
 CFLAGS = -I$(EMHOME)/h -I$(EMHOME)/modules/h -O
-OBS = failed.o insert.o internerr.o io.o getid.o
+SRC = failed.c insert.c internerr.c getid.c
+OBS = failed.o insert.o internerr.o getid.o
 
 all:		libeme.a libemk.a em_code.3
 		rm -f C_*.c
@@ -22,11 +22,11 @@ em_code.3:	em_code.3X
 		-sh -c 'tbl < em_code.3X > em_code.3'
 		-sh -c 'if test -s em_code.3 ; then : ; else cp em_code.3X em_code.3 ; fi '
 
-libeme.a:	make.sh e/em_private.h e/em.c $(OBS)
+libeme.a:	make.sh e/em_private.h e/em.c $(OBS) io.c
 		EMHOME=$(EMHOME); export EMHOME; sh make.sh e
 		-sh -c 'ranlib libeme.a'
 
-libemk.a:	make.sh k/em_private.h k/em.c $(OBS)
+libemk.a:	make.sh k/em_private.h k/em.c $(OBS) io.c
 		EMHOME=$(EMHOME); export EMHOME; sh make.sh k
 		-sh -c 'ranlib libemk.a'
 
@@ -37,7 +37,7 @@ em.gen:		make.em.gen $(EMHOME)/etc/em_table
 		make.em.gen $(EMHOME)/etc/em_table > em.gen
 
 pr:
-		@pr Makefile make.em.gen make.fun em.nogen e/em_private.h e/em.c k/em_private.h k/em.c
+		@pr Makefile make.em.gen make.fun em.nogen insert.h $(SRC) e/em_private.h e/em.c k/em_private.h k/em.c
 
 opr:
 		make pr | opr
@@ -50,12 +50,9 @@ clean:
 		rm -f *.a em_code.3 em.gen make.sh
 
 lintlib:	make.sh
-		lint -I../../h -I../../../h -Ie -Ceme *.c e/*.c
-		lint -I../../h -I../../../h -Ik -Cemk *.c k/*.c
+		lint -I. -I../../h -I../../../h -Ie -Ceme $(SRC) e/*.c
+		lint -I. -I../../h -I../../../h -Ik -Cemk $(SRC) k/*.c
 		mv llib-leme.ln llib-lemk.ln $(EMHOME)/modules/lib
 
 insert.o:	insert.c insert.h
-		$(CC) $(CFLAGS) -c $(INCORE) insert.c
-
-io.o:		io.c insert.h
-		$(CC) $(CFLAGS) -c $(INCORE) io.c
+		$(CC) $(CFLAGS) -c insert.c