diff --git a/ChangeLog.n b/ChangeLog.n index e8571a3bd1f3b547032df61f4b46c258bf56b323..05427245de1fcdd6651f93a1ce6082879df819bc 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -10,6 +10,11 @@ If there are user-visible changes in this commit, then list the <standard changelog date stamp> * <changes go here...> +******************************************************************************* +join from acl62 to trunk on 7/3/03 +command: + join.sh acl62 acl62_to_trunk_merge3 acl62_to_trunk_merge_070303 clim2 + ******************************************************************************* 2.3.20 @@ -55,6 +60,17 @@ join from acl62 to trunk on 7/9/02 ******************************************************************************* <no version change> +2003-05-29 Kevin Layer <layer@crikey> + + * Makefile.wnn: so it compiles on RH 9 + +2003-04-30 Kevin Layer <layer@crikey> + + for bug12007: + * Makefile.cobjs, + * Makefile.linux, + * Makefile.wnn: add -lpthread on linux + 2003-01-13 Kevin Layer <layer@crikey> * Makefile.macosx: work in progress diff --git a/Makefile.cobjs b/Makefile.cobjs index 2263a2e5dd92be74b1e0ba0385c1de691735330b..c71c81db67755155c80744137abe0d87957f1740 100644 --- a/Makefile.cobjs +++ b/Makefile.cobjs @@ -1,4 +1,4 @@ -# $Header: /repo/cvs.copy/clim2/Makefile.cobjs,v 1.20 2002/07/09 20:57:14 layer Exp $ +# $Id: Makefile.cobjs,v 1.21 2003/07/03 21:04:26 layer Exp $ # # Makefile.cobj for CLIM 2.0 # @@ -53,7 +53,7 @@ xlibsupport.o : xlib/xlibsupport.c climxm.$(SHARED_EXT): xlibsupport.o xtsupport.o xmsupport.o $(IMPORTS) (eval '$(SET_LIBRARY_PATH)' ; \ $(MAKE_SHARED) $(SHAREFLAGS) -o climxm.$(SHARED_EXT) \ - xlibsupport.o xtsupport.o xmsupport.o \ + xlibsupport.o xtsupport.o xmsupport.o $(THREADLIB) \ $(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB) $(MOTIFXTRAS)) # climxm.sl: xlibsupport.o xtsupport.o xmsupport.o $(IMPORTS) diff --git a/Makefile.linux b/Makefile.linux index 52eb9ebe945db2df2f8dc6c884c64999370e67ff..b86f4581cc0f3361233906b9b6b04ed8d3d5c940 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -1,4 +1,4 @@ -# $Id: Makefile.linux,v 1.3 2002/07/09 20:57:14 layer Exp $ +# $Id: Makefile.linux,v 1.4 2003/07/03 21:04:26 layer Exp $ include Makefile.defs @@ -9,6 +9,7 @@ XINCLUDES=-I/usr/X11R6/include TKLIB=-lXm -lXpm -lXext -lXp XTLIB=-lXt XLIB=-lX11 +THREADLIB = -lpthread SET_LIBRARY_PATH = LD_RUN_PATH=/usr/X11R6/lib:/lib:/usr/lib; export LD_RUN_PATH diff --git a/Makefile.wnn b/Makefile.wnn index a6f9c18e9afb7e72ad7baabdd1454ca0fdc1b5ac..1cee94b5d6ce9a82247be2da35ea12d5a9a4328c 100644 --- a/Makefile.wnn +++ b/Makefile.wnn @@ -1,4 +1,4 @@ -# $Header: /repo/cvs.copy/clim2/Makefile.wnn,v 1.8 2002/07/09 20:57:14 layer Exp $ +# $Id: Makefile.wnn,v 1.9 2003/07/03 21:04:26 layer Exp $ # # Makefile.wnn for CLIM 2.0 # @@ -79,6 +79,18 @@ ifeq ($(REDHAT),6) REDHATLIBS = -lcrypt endif +ifeq ($(REDHAT),7) +REDHATLIBS = -lcrypt +endif + +ifeq ($(REDHAT),8) +REDHATLIBS = -lcrypt +endif + +ifeq ($(REDHAT),9) +REDHATLIBS = -lcrypt +endif + ifeq ($(OS_NAME),linux) ifeq ($(MACHINE),ppc) REDHATLIBS = -lcrypt @@ -91,4 +103,4 @@ endif wnn.$(SHARED_EXT): $(WNN_OBJS) $(MAKE_SHARED) $(SHAREFLAGS) -o wnn.$(SHARED_EXT) $(WNN_OBJS) \ - $(REDHATLIBS) + $(REDHATLIBS) $(THREADLIB)