NLOGvsLOGImakefilediffs.050808.0038 --------------------------------------- PRNLOG works on Mercury, not on saturn. PRLOG may work oin saturn - it isolder. ---------------------------------------------------- saturn.cs.uml.edu(255)> diff $PRNLOG/Imakefile $PRLOG/Imakefile|wc 117 676 4862 saturn.cs.uml.edu(257)> diff $PRNLOG/Imakefile $PRLOG/Imakefile >> NLOGvsLOGImakefilediffs.050808.0038 ------------------------------ 5a6,38 > *********************************************************** > * This Imakefile is for bde/pr_util_log. - RJL050805 > * It updates files in bde/{pr_util_log/{,$(HOSTTYPE)/{obj,bin}} > * > ******************************************************************* > * subst -Wall for -w - RJL 2k0712 > * add pr_stats.c, pr_stats.o - RJL 2k0718 > * In bde/configure,h, #define BDELOG to generate and use pr_log.c > * or #define BDEREPLAY to replay from logdata.txt. > * This now adds GENLOG instead of BDELOG to GENDFINES -RJL 020401 > * > * Add this to GenerateLibFromSchema' to run chgen > * and create pr_*.c, *schema.h: > * $(GENSRCS): schemafile > * $(CHGEN) $(GENFLAGS) schemafile > * > ************************************************************ > * configure.h #defines GENVxx, GENLOG, and > * optional BDELOG (or BDEREPLAY, and BDEONEOF) > * To resolve a double-maintenance problem, > * GENVERSION is assigned in bde/Imakefile > * and substituted into -D$(GENVERSION) > * (NEW_VERSION flag is used in genv11/src/Makefile, not at runtime) > * > * bde/Imakefile #includes configure.h which has optional -DGENLOG > * This adds GENLOG and (app-specific) -DBDELOG to BDEDEFINES > * Both BDELOG and BDEREPLAY need pr_log.c: > * WARNING: dprint.h updates do not cause dprint.c recompilation!??-RJL041129 > * > * I added (and checked-in) lut.c to GENSRCS, lut.h to GENOBJS. - RJL050721 > * (copied from $CASE/gen/ver_13/chgen/src/pr_util) - RJL050721 > * GENLOG changes conditional code in pr_*.c and adds new file pr_log.c: > * Moved all comments to top - RJL050807 8,14d40 < /* This Imakefile is for bde/pr_util_log. - RJL050805 < * It updates files in bde/{pr_util_log/{,obj,$(HOSTTYPE)/bin}} < * As of 050807, it fails on Linux: $(PRDIR) is doubled on sources. < */ < < /* See -r 1.16 of bde/pr_util/Imakefile for earlier revs. < 16,17d41 < /* configure.h #defines GENVxx, GENLOG, and ... */ < /* PRDIR BINDIR PROBJDIR are defined in bde/Imakefile */ 22a47,48 > SCHEMASRCS = $(TOP)/schema/94sbde_schema.sch > 33,34c59 < SCHEMASRCS = $(TOP)/schema/94sbde_schema.sch < SCHEMA_INCLUDE = $(PRDIR) --- > /* Defined in bde/Imakefile: PROBJDIR, PRDIR */ 35a61 > SCHEMA_INCLUDE = $(PRDIR) 37,38d62 < < /* (NEW_VERSION flag is used in genv11/src/Makefile, not at runtime) */ 41,50d64 < /* bde/Imakefile (vi configure.h?) adds -DGENLOG to GENDEFINES */ < /* and (bde-specific) -DBDELOG to BDEDEFINES */ < /* Both BDELOG and BDEREPLAY need pr_log.c: */ < /* define GENLOG in #included configure.h - RJL 020924 */ < /* Note: GENDEFINES passed thru but not available here - RJL 020924 */ < /* WARNING: dprint.h updates do not cause dprint.c recompilation!??-RJL041129 */ < < /* I added lut.c to GENSRCS, lut.h to GENOBJS. - RJL050721 */ < /* (copied from $CASE/gen/ver_13/chgen/src/pr_util) - RJL050721 */ < 52d65 < 76c89 < #else --- > #endif 77a91 > #ifndef GENLOG 101,117d114 < < /* GenerateLibFromSchema is always executed, so I removed GENSRCS: < * schemafile dependency, to avoid running chgen13 -RJL050604 < * Comments removed so Makefile is not in error-RJL050806 < * $(GENSRCS): schemafile < * $(CHGEN) $(GENFLAGS) schemafile < */ < < /* Below, '$(PRDIR)/$(*).c' selects current source file */ < /* In $(*).c, parens are ESSENTIAL! -RJL050806 */ < /* src/Imakefile Ptrn rules: $(OBJDIR)%.o : $(SRCDIR)%.cc */ < /* $PR[N]LOG/Imakefile : $(PROBJDIR)%.o : $(PRDIR)%.c */ < /*$(GENOBJS):$(GENSRCS) @@\ < $(CC) -g -c -Wall $(GENDEFINES) $< -o $(@) @@\ < [$(<) -o $(@)] works on mercury, not on saturn!-RJL050807] < */ < 119,124c116,117 < ifdef linuxArchitecture @@\ < $(PROBJDIR)/%.o : $(PRDIR)/%.c @@\ < else @@\ < .c.o: @@\ < endif @@\ < $(CC) -g -c -Wall $(GENDEFINES) $(<) -o $(@) @@\ --- > $(GENOBJS):$(GENSRCS) @@\ > $(CC) -g -c -Wall $(GENDEFINES) $(PRDIR)/$(*).c -o $(@) @@\ 140,150d132 < /* GenerateLibFromSchema is always executed, so I removed GENSRCS: < * schemafile dependency, to avoid running chgen13 -RJL050604 < */ < < /* RJL050604: Removed space before libname and clean actions */ < /* I removed GENSRCS from clean action - RJL 011204 - */ < /* it destroyed pr_*.c once too often. */ < /* Allowing 'touch schema/94sbde_schema.sch' risks */ < /* accidentally updating schema.sch will clobber pr_*.c */ < /* To regenerate GENSRCS, cd $PRDIR and run */ < /* 'chgen13 -metafile -nolog ../schema/94sbde_schema.sch' */