cvsdiffImakefile050811
---------------------
Index: Imakefile
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/Imakefile,v
retrieving revision 1.26
diff -r1.26 Imakefile
6,112c6,23
<  * Revision 1.25  2005/07/25 01:42:03  lechner
<  * Minor comment changes;
<  *
<  * Revision 1.24  2005/06/17 03:19:29  lechner
<  *  DEPXMLIB = /usr/include  -( $(RL)/include removed - RJL050609 )
<  *
<  * Revision 1.23  2005/06/08 01:38:27  lechner
<  *  Added 'CXX=$(CXX)' under Pass.. flags to subdirectories
<  *
<  * Revision 1.22  2005/05/29 02:33:20  lechner
<  * Changed GENVERSION to  "GENV13" and  GENDEFINES to -DGENV12
<  * Note: see also configure.h
<  * ---
<  * > GENDEFINES = -DGENV13
<  *
<  * Revision 1.21  2005/05/02 03:24:07  lechner
<  * Edited to remove merge conflics from tag bde2alpha_rv
<  *
<  * 
<  * Revision 1.17.4.10  2004/07/20 05:19:56  lechner
<  * This is a protective checkin of current (040719)  bde tree to avoid backup/restore risks.
<  * I first used cvs rtag bde04s to tag the prior repository versions (circa Apr-May 2004).
<  * Then I did cvs update and cvs ci, TBFollowed by cvs tag bde040720 bde. - RJL040720
<  * Path to bde's current development version: $RL = ~/bde2alpha_rl/sandbox/bdecheckout/bde.
<  *
<  * Revision 1.17.4.9  2004/04/06 02:21:13  lechner
<  * Avoided conditional dependence on ' XDIRY = X11R6'. Better PASS/FAIL reporting .
<  *
<  * Revision 1.17.4.8  2004/04/03 06:28:00  lechner
<  * Modified #if conditionals.
<  * Replaced #ifdef BDEREPLAY by #ifndef BDELOG
<  * (replay and logging are mutex so far)
<  * Added #ifdef LinuxArchitecture to compile on mercury.
<  * (this affects CPLUSPLUSFLAGS and XDIRY)
<  * Added $(RL)/include to DEPXMLIB
<  * (Warning: this is NOT portable - test-build without it.)
<  *
<  * Revision 1.17.4.7  2002/04/11 04:00:13  lechner
<  * I updated GENDFINES and BDEDEFINES to eliminate unresolved symbols
<  *
<  * Revision 1.17.4.6  2002/04/06 07:49:55  lechner
<  * Edits which no longer assume BDELOG and BDEREPLAY are mutex
<  *
<  * Revision 1.17.4.5  2002/04/01 21:20:42  lechner
<  * Replaced BDELOG by GENLOG in -DGENDEFINES
<  *
<  * Revision 1.17.4.4  2002/03/22 04:00:13  lechner
<  * Mods to #defined environment vars; added BDELOG;
<  * (cvs diff Imakefile reports 62  lines)
<  *
<  * sandbox revision - to test gen/ver_12/sjaganat 
<  * Conditionally add -DBDELOG to GENDEFINES and BDEDEFINES - RJL 020309
<  * Revision 1.17.4.3  2000/09/23 02:23:46  lechner
<  * I did cvs ci bde, to be followed by cvs tag bde2alpha.2k0922 bde and cvs co;
<  * checkin updates the repository, tag adds a new tag to current branch 
<  * (tag bde2apha_rv), in the repository but not locally, 
<  * amd cvs co makes the local version have that tag.
<  *
<  * Revision 1.17.4.2  2000/04/06 07:08:02  lechner
<  * I checked  in 7 updated files  and added tag bde2alpha_rjl
<  * Files include 3 Imakefiles, bde/{configure.h,aareadme,src/fileio.cc,
<  * executables/bde}
<  *
<  * Revision 1.17.4.1  1999/05/19 22:19:15  vdhamoda
<  * bde2alpha_rv_final
<  *
<  * Revision 1.20  1997/09/23 07:00:18  lechner
<  * Removed the g++-include and gcc-include paths;
<  * Added YuWong's separate path to the gif encoder.
<  *
<  * Revision 1.19  1997/03/22  06:37:03  lechner
<  * Removed the #ifdef GENV6 condition - v6 is obsolete - RJL
<  *
<  * Revision 1.18  1996/12/18 19:37:29  cparisi
<  * BDECODE project 96f523
<  * adds new "text" class that consolidates some of the test operations.
<  *
<  * Revision 1.17  1995/10/18 21:51:41  rdias
<  * Commented out the g++-include and gcc-include paths in the IMAKE_CMD section.
<  * The IMAKE_CMD does not use these to make Makefiles in the subdirectories.
<  *
<  *Revision 1.16  1995/03/16  03:16:55  lechner
<  *Updated BDEDEFINES (LIB_PATH --> BDE_LIB_PATH as in configure.h
<  *
<  *Revision 1.1.1.1  1995/01/04  06:03:42  lechner
<  *Imported 94fbde tree to 95sbde
<  *
<  * Revision 1.6  1994/08/22  20:51:09  lechner
<  * added -V 2.5.8 as per sysmsg 3124 94/7/21 (bug in latest release of g++)
<  *
<  * Revision 1.5  1994/04/16  20:03:36  jrichard
<  * added warnings section
<  *
<  * Revision 1.4  1994/04/13  20:21:09  mtorpey
<  * Modified configure.h to allow the developer to specify the default
<  * lib path for the necessary run time files..  Imakefile needed to
<  * be modified to reflect this change.
<  *
<  * Revision 1.3  1994/04/11  15:20:08  jrichard
<  * added the bdegeo link coordinate system define USE94SLC
<  *
<  * Revision 1.2  1994/04/07  21:35:53  jrichard
<  * version of Imakefile with support for GENV8 and many bugs fixed
<  *
<  ******************************************************************
<  */
< /* WARNING: man imake says ':' chars in command lines MUST BE escaped ('\:'). */
---
>  *******************************************************************/
> /*
>  * Imakefile [-DLOG] generates Makefiles to compile and link build bde 
>  * either without or with logging and replay capability.
>  * The Makefiles generated by xmkmf -a  are based on separate Imakefiles
>  * in src, pr_log and pr_nolog; 
>  * This Imakefile redefines SUBDIRS conditionally on -DLOG.
>  * It compiles obj and executable files under $HOSTTYPE directories.
>  * depending on $HOSTTYPE and on #ifdef LOG (-DLOG)
> 
>  * The directory tree for builds is:
>  * bde/{src, pr_util_nolog, pr_util_log, $HOSTTYPE/{obj, executables}}
>  * It assumes that this tree exists, as created by buildbdetree
>  * or (TBD:) as checked out (empty) from CVS.
> */
> 
> /********* TBD: Add text subdirectory for XB *****Haiyan********/
> /********* TBD: Add extern_code for YuWong's bde2gif ***********/ 
113a25
> /* WARNING: man imake says ':' chars in command lines MUST BE escaped ('\:'). */
117a30,47
> /* xmkmf -a -DLOG modifies configure.h from linux only, not alpha.-RJL050810 */
> /* On alpha hosts, I can't make -DLOG work via configure.h, imake or make.*/ 
> 
> /* TBD Goal of this version: 
> * Add target 'make log' to add pr_log.c and alters other pr_*.c files 
> * Add target 'make pr_util' to run chgen13 and regenerate pr_[no]log files.
> * (Or create separate versions of Makefiles called from makebde shellproc).
> * Question: Can -log target redefine the path to pr_util.a?
> * Create bde/$HOSTTYPE/{obj,bin} for alpha and i386-linux $HOSTTYPES.
> * (for separate $HOSTTYPE_dependent build trees).
> *
> * saturn.cs.uml.edu(144)> cat $RB/chgen/src/buildgen
> * mkdir {alpha,i386-linux}
> * mkdir pr_util_{log,nolog}
> * mkdir {alpha,i386-linux}/{obj_log,obj_nolog,bin}
> * (bin was formerly executables}
> * bin has both bdelog.exe and bdenolog.exe files.
> */
130a61,62
> CXXLINK 	= cxx
> #endif
132c64
< #else
---
> #ifndef USEDECC
138a71
> CXXLINK 	= g++
139a73
> /* CXXLINK added - RJL050810 */
163a98
> /* INDEPENDENTLY: USE94LC #defines -DS94LC and USELCWC #defines -DLCWC : */
183,185c118,123
< /* INDEPENDENTLY: USE94LC #defines -DS94LC and USELCWC #defines -DLCWC : */
< 
< #ifdef BDELOG
---
> /* RJL050810: xmkmf -a -DLOG works on mercury but NOT on saturn.*/
> /* Then, $PR[N}LOG/Imakefile uses #ifdef LOG to set $PRDIR 
>  * to pr_util_[no]log, and to #define (or not) BDELOG and GENLOG 
> #ifdef LOG
> #define BDELOG
> #define GENLOG
187,188c125,126
< BDEDEFINES = $(BDEUSERDEFINES) $(S94LCDEFINE) \
<              $(DCLCDEFINE) -DDEFAULT_LIB_PATH=\"$(BDE_LIB_PATH)\" -DBDELOG
---
> BDEDEFINES = $(BDEUSERDEFINES) $(S94LCDEFINE) -DBDELOG \
>              $(DCLCDEFINE) -DDEFAULT_LIB_PATH=\"$(BDE_LIB_PATH)\" 
191c129
< #ifndef BDELOG
---
> #ifndef LOG
197,199c135
< /* echo doesn't work in Imakefile? */
< /* echo "BDEDEFINES = $(BDEDEFINES)" */
< 
---
> /* echo doesn't work; cpp translates Imakefile to a .c  program */
212,213d147
< /* added 040531 - RJL: */
< /* CDEBUGFLAGS = -DDEBUG -pg //profile? */
216,218d149
< /* RJL 040531: make on Linux doesn't have symbol tables - is an option missing? */
< 
< /* I added -Wall in ~/bdealpha_rjl  - RJL 2k0523 	*/
220,228d150
< /* what about Linux? - see bde/src/Imakefile which contains: */
< /* #ifdef LinuxArchitecture                             */
< /*    EXTRA_LIBRARIES = -lXm -lXt -lX11 -lm -lbsdmalloc */
< /* 030819: linux/mercury: in xmkmf -a fails to find <std.h>   */
< /* from lots of bde/src files (e.g. draw.cc)		*/
< /* Perhaps <stdlib.h> will do as it does for USEDECC?	*/
< 
< /* This becomes a runtime option  in Makefiles: */
< /* if ( $HOSTTYPE == 'i386-linux' ) then */
236c158
< /* GENFLAGS are #defined in pr_util/Imakefile */
---
> /* GENFLAGS are #defined in pr_util_[no]log/Imakefile */
250,252d171
< /* removed this one - see pr_util/Imakefile - RJL 020410 
<  * 			'GENFLAGS=$(GENFLAGS)'
<  */
254c173,184
< /********* Add text subdirectory***********Haiyan************/
---
> /* Define a 4-way branch to the obj and bin directories: */
> #ifdef LOG
> PRDIR = $(TOP)/pr_util_log
> #endif
> 
> #ifndef LOG
> PRDIR = $(TOP)/pr_util_nolog
> #endif
> 
> PROBJDIR = $(PRDIR)/$(HOSTTYPE)/probj
> BINDIR   = $(PRDIR)/$(HOSTTYPE)/bin
> OBJDIR   = $(PRDIR)/$(HOSTTYPE)/obj
256c186,197
< SUBDIRS = pr_util /*extern_code for YuWong's bde2gif */ src 
---
> SUBDIRS  = $(PRDIR) src
> /* SUBDIRS not respected by linux make for PRDIR -RJL050810 */
> /********* Add text subdirectory for XB *****Haiyan********/
> /********* Add extern_code for YuWong's bde2gif ***********/
> 
> #ifdef LinuxArchitecture
> XmLIB = /usr/X11R6/lib/Xm 
> #endif
> 
> #ifndef LinuxArchitecture
> XmLIB = /usr/lib/Xm
> #endif
261,266c202
< #ifdef LinuxArchitecture 
< IMAKE_CMD = $(IMAKE) -DUseInstalled -Dnostdinc \
<              -I/usr/lib/X11/config \
<                 -I/usr/X11R6/lib/Xm \
<                 $(IMAKE_DEFINES)
< #else 
---
> 
268,269c204
< 	     -I/usr/lib/X11/config \
< 		-I/usr/lib/Xm \
---
> 	     -I/usr/lib/X11/config -I$(XmLIB) \
271,281d205
< #endif
< 
< 
< /* Added /usr/X11R6/include for Linux on Mercury - RJL 030819 		*/
< /* Removed it - linux now has same symlink as saturn - RJL 030820 	*/
< /* Added #define LinuxArchitecture #if HOSTTYPE = i386-linux RJL 030822 */
< /* Saturn: /usr/lib/{X11,libX*.a} (49 files) 		*/
< /* Mercury: /usr/X11R6/lib/{X11/*,libX*.a} (27 files) 	*/
< /* On mercury:  /usr/lib/X11 -> ../X11R6/lib/X11 	*/
< /* but /usr/lib is NOT linked to /usr/X11R6/lib 	*/
< /* so must use /usr/X11R6/lib/libX*.a  instead of /usr/lib/libX*.a  	*/
284c208
< /* $(RL)/include (removed - RJL050609) */
---
>