Makefile:

- modified for use with the new *.mk files
descc.rez, describe.rez, descu.rez:
	- added build date

usr.orca.bin/describe/Makefile

@@ -14,8 +14,6 @@
 #	descu		861 bytes
 
 CFLAGS	+= -O78 -s1024 # -D__STACK_CHECK__
-LDFLAGS	+= -v
-LDLIBS	+= 
 
 # If this is not part of the GNO builds, RELEASE_DIR is not defined
 # so things get installed in a live file system instead.
@@ -35,47 +33,56 @@ VAEND		= # vaend.o
 DESC_FILES	= describe.desc descc.desc descu.desc
 
 # A stand-alone build might not have these defined.
-.IF $(INSTALL) == $(NULL)
+INSTALL	*= /usr/bin/install
-	INSTALL	= /usr/bin/install
+CATREZ	*= /usr/bin/catrez
-.END
-.IF $(CATREZ) == $(NULL)
-	CATREZ	= /usr/bin/catrez
-.END
 .IF $(DESC_DIR) == $(NULL)
 	DESC_DIR= $(RELEASE_DIR)/usr/lib
 	DESC_SRC= $(DESC_DIR)/describe.src
 .END
 
-build:  describe descc descu
+build:  $(OBJ_DIR) $(OBJ_DIR)describe $(OBJ_DIR)descc $(OBJ_DIR)descu
 
-descc:	descc.o $(BASENAME) descc.r
+$(OBJ_DIR):
-	$(CC) $(LDFLAGS) descc.o $(BASENAME) -o $@ $(LDLIBS)
+	$(INSTALL) -d $(OBJ_DIR)
-	$(CATREZ) -d $@ descc.r
 
-describe: describe.o $(BASENAME) describe.r
+$(OBJ_DIR)descc: descc.o $(BASENAME) descc.r
-	$(CC) $(LDFLAGS) describe.o $(BASENAME) -o $@ $(LDLIBS)
+	$(CC) -o $@ $(LDLIBS) $(LDFLAGS) $(OBJ_DIR)descc.o $(BASENAME)
-	$(CATREZ) -d $@ describe.r
+	$(CATREZ) -d $@ $(OBJ_DIR)descc.r
 
-descu:	descu.o $(BASENAME) $(VAEND) descu.r
+$(OBJ_DIR)describe: describe.o $(BASENAME) describe.r
-	$(CC) $(LDFLAGS) descu.o $(BASENAME) $(VAEND) -o $@ $(LDLIBS)
+	$(CC) -o $@ $(LDLIBS) $(LDFLAGS) $(OBJ_DIR)describe.o $(BASENAME)
-	$(CATREZ) -d $@ descu.r
+	$(CATREZ) -d $@ $(OBJ_DIR)describe.r
 
-descc.o:: desc.h
+$(OBJ_DIR)descu: descu.o $(BASENAME) $(VAEND) descu.r
-describe.o:: desc.h
+	$(CC) -o $@ $(LDLIBS) $(LDFLAGS) $(OBJ_DIR)descu.o $(BASENAME) $(VAEND)
-descu.o:: desc.h
+	$(CATREZ) -d $@ $(OBJ_DIR)descu.r
 
+descc.o: descc.c desc.h
+	$(CC) -o $@ $(CFLAGS:s/ -r / /) -a0 -c descc.c
+
+describe.o: describe.c desc.h
+	$(CC) -o $@ $(CFLAGS:s/ -r / /) -a0 -c describe.c
+
+descu.o: descu.c desc.h
+	$(CC) -o $@ $(CFLAGS:s/ -r / /) -a0 -c descu.c
+
+.IF $(RELEASE_DIR) == $(NULL)
+release:
+	@echo there is no release target on a stand alone build
+.ELSE
 release:
 	$(INSTALL) -d $(RELBIN) $(RELSBIN) $(RELMAN)/man1 $(RELMAN)/man8
 	$(INSTALL) -d $(DESC_DIR)
-	$(INSTALL) describe        $(RELBIN)
+	$(INSTALL) $(OBJ_DIR)describe $(RELBIN)
-	$(INSTALL) descc descu     $(RELSBIN)
+	$(INSTALL) $(OBJ_DIR)descc $(OBJ_DIR)descu $(RELSBIN)
 	$(INSTALL) describe.1      $(RELMAN)/man1
 	$(INSTALL) descc.8 descu.8 $(RELMAN)/man8
-	./descu -o $(DESC_SRC) $(DESC_SRC) $(DESC_FILES)
+	$(OBJ_DIR)descu -o $(DESC_SRC) $(DESC_SRC) $(DESC_FILES)
+.END
 
 install:
 	$(INSTALL) -d $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
-	$(INSTALL) describe        $(BINDIR)
+	$(INSTALL) $(OBJ_DIR)describe $(BINDIR)
-	$(INSTALL) descc descu     $(SBINDIR)
+	$(INSTALL) $(OBJ_DIR)descc $(OBJ_DIR)descu $(SBINDIR)
 	$(INSTALL) describe.1      $(MANDIR)/man1
 	$(INSTALL) descc.8 descu.8 $(MANDIR)/man8

usr.orca.bin/describe/descc.rez

@@ -1,14 +1,15 @@
 /*
  * Resources for version and comment
  *
- * $Id: descc.rez,v 1.3 1998/02/07 06:39:59 gdr-ftp Exp $
+ * $Id: descc.rez,v 1.4 1998/03/08 17:58:41 gdr-ftp Exp $
  */
 #include "Types.rez"
 
 /* Don't forget to update the version numbers, below (two places) */
 #define PROG	"descc"
 #define DESC	"describe(1) source compiler"
-#define AUTHOR	"Author: James Brookes <jamesb@ecst.csuchico.edu>"
+#define AUTHOR	"Author: James Brookes"
+#define BUILD_DATE "Build Date:  " $$Date
 
 /*
  * Version
@@ -19,7 +20,8 @@ resource rVersion (1, purgeable3) {
 	  0 },		/* non-final release number */
 	verUS,	/* Country */
 	PROG,	/* Program name */
-        DESC " (GNO)"
+        DESC " (GNO)\n"
+        BUILD_DATE
 };
 
 /*
@@ -28,6 +30,7 @@ resource rVersion (1, purgeable3) {
 resource rComment (1, purgeable3) {
 	PROG " v1.0.6\n"
 	DESC " (GNO) \n"
+	BUILD_DATE "\n"
 	AUTHOR
 };
 

usr.orca.bin/describe/describe.rez

@@ -1,14 +1,15 @@
 /*
  * Resources for version and comment
  *
- * $Id: describe.rez,v 1.3 1998/02/07 06:40:05 gdr-ftp Exp $
+ * $Id: describe.rez,v 1.4 1998/03/08 17:58:43 gdr-ftp Exp $
  */
 #include "Types.rez"
 
 /* Don't forget to update the version numbers, below (two places) */
 #define PROG	"describe"
 #define DESC	"program information database utility"
-#define AUTHOR	"Author: James Brookes <jamesb@ecst.csuchico.edu>"
+#define AUTHOR	"Author: James Brookes"
+#define BUILD_DATE "Build Date:  " $$Date
                                         
 /*
  * Version
@@ -19,7 +20,8 @@ resource rVersion (1, purgeable3) {
 	  0 },		/* non-final release number */
 	verUS,	/* Country */
 	PROG,	/* Program name */
-        DESC " (GNO)"
+        DESC " (GNO)\n"
+        BUILD_DATE
 };
 
 /*
@@ -28,6 +30,7 @@ resource rVersion (1, purgeable3) {
 resource rComment (1, purgeable3) {
 	PROG " v1.0.6\n"
 	DESC " (GNO) \n"
+	BUILD_DATE "\n"
 	AUTHOR
 };
 

usr.orca.bin/describe/descu.rez

@@ -1,14 +1,15 @@
 /*
  * Resources for version and comment
  *
- * $Id: descu.rez,v 1.3 1998/02/07 06:40:11 gdr-ftp Exp $
+ * $Id: descu.rez,v 1.4 1998/03/08 17:58:44 gdr-ftp Exp $
  */
 #include "Types.rez"
 
 /* Don't forget to update the version numbers, below (two places) */
 #define PROG	"descu"
 #define DESC	"describe(1) source update utility"
-#define AUTHOR	"Author: Devin Reade <gdr@trenco.gno.org>"
+#define AUTHOR	"Author: Devin Reade"
+#define BUILD_DATE "Build Date:  " $$Date
 
 /*
  * Version
@@ -19,7 +20,8 @@ resource rVersion (1, purgeable3) {
 	  0 },		/* non-final release number */
 	verUS,	/* Country */
 	PROG,	/* Program name */
-        DESC " (GNO)"
+        DESC " (GNO)\n"
+        BUILD_DATE
 };
 
 /*
@@ -28,6 +30,7 @@ resource rVersion (1, purgeable3) {
 resource rComment (1, purgeable3) {
 	PROG " v1.0.6\n"
 	DESC " (GNO) \n"
+	BUILD_DATE "\n"
 	AUTHOR
 };