[eros-cvs] cvs commit: eros/src/build/lib/make makerules.mk makevars.mk

[shap@eros.cs.jhu.edu]

shap        01/07/06 17:49:35

  Modified:    src/build/lib/make makerules.mk makevars.mk
  Log:
  Final updates for new constituents conventions

Revision  Changes    Path
1.61      +8 -1      eros/src/build/lib/make/makerules.mk

Index: makerules.mk
===================================================================
RCS file: /cvs/eros/src/build/lib/make/makerules.mk,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- makerules.mk	2001/07/03 17:57:56	1.60
+++ makerules.mk	2001/07/06 21:49:35	1.61
@@ -201,7 +201,7 @@
 
 do-clean: recursive-clean
 	-rm -f *.o *.m core *~ new.Makefile  ".#"*
-	-rm -f .*.m sysgen.map $(TARGETS) TAGS $(GENERATED)
+	-rm -f .*.m sysgen.map $(TARGETS) TAGS
 	-rm -f *.dvi *.blg *.aux *.log *.toc $(CLEANLIST)
 
 recursive-clean:
@@ -295,3 +295,10 @@
 		fi; \
 	done
 endif
+
+
+constituents.h: $(IMGMAP)
+	grep CONSTIT $< | \
+		sed 's/^[^,]*, */#define /' | \
+		sed 's/).*$$//' | \
+		sed 's/,/ /' > $@



1.29      +2 -2      eros/src/build/lib/make/makevars.mk

Index: makevars.mk
===================================================================
RCS file: /cvs/eros/src/build/lib/make/makevars.mk,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- makevars.mk	2001/04/23 17:04:50	1.28
+++ makevars.mk	2001/07/06 21:49:35	1.29
@@ -207,5 +207,5 @@
 # empty, so the appropriate word is the second one.
 PACKAGE=$(word 1, $(strip $(subst /, ,$(subst $(EROS_ROOT)/src/,,$(PWD)))))
 
-
-
+# Until proven otherwise...
+IMGMAP=imgmap