Skip to content
Snippets Groups Projects
Commit 714c4194 authored by layer's avatar layer
Browse files

join from acl62 to trunk

parent 1b25b3d2
No related branches found
No related tags found
No related merge requests found
...@@ -10,6 +10,12 @@ If there are user-visible changes in this commit, then list the ...@@ -10,6 +10,12 @@ If there are user-visible changes in this commit, then list the
<standard changelog date stamp> <standard changelog date stamp>
* <changes go here...> * <changes go here...>
*******************************************************************************
no version change
join from acl62 to trunk on Tue Jan 14 20:47:49 PST 2003
command:
./join.sh acl62 acl62_to_trunk_merge2 acl62_to_trunk_merge3 clim2
******************************************************************************* *******************************************************************************
2.3.18 2.3.18
...@@ -33,6 +39,10 @@ join from acl62 to trunk on 7/9/02 ...@@ -33,6 +39,10 @@ join from acl62 to trunk on 7/9/02
******************************************************************************* *******************************************************************************
<no version change> <no version change>
2003-01-13 Kevin Layer <layer@crikey>
* Makefile.macosx: work in progress
2002-08-09 Duane Rettig <duane@beta> 2002-08-09 Duane Rettig <duane@beta>
* Makefile: Added power64 port * Makefile: Added power64 port
......
# $Header: /repo/cvs.copy/clim2/Makefile.macosx,v 1.2 2002/07/09 20:57:14 layer Exp $ # $Id: Makefile.macosx,v 1.3 2003/01/15 04:51:07 layer Exp $
# #
# Makefile.macosx for CLIM 2.0 # Makefile.macosx for CLIM 2.0
# #
...@@ -13,15 +13,17 @@ SHARED-OL-OBJS= climol.dylib ...@@ -13,15 +13,17 @@ SHARED-OL-OBJS= climol.dylib
Makefile=Makefile.macosx Makefile=Makefile.macosx
SET_LIBRARY_PATH = \ SET_LIBRARY_PATH = \
DYLD_LIBRARY_PATH=/usr/local/lib:/usr/X11R6/lib:/lib:/usr/lib:$(DYLD_LIBRARY_PATH); export DYLD_LIBRARY_PATH DYLD_LIBRARY_PATH=/usr/local/lib:/usr/local/X11R6/lib:/lib:/usr/lib:$(DYLD_LIBRARY_PATH); \
export DYLD_LIBRARY_PATH
#CL=../src/xm-dcl #CL=../src/xm-dcl
TKLIB=-lXm TKLIB=-lXm
XTLIB=-L/usr/X11R6/lib -lXt XTLIB=-L/usr/local/X11R6/lib -lXt
XLIB=-L/usr/X11R6/lib -lX11 /usr/local/lib/liblanginfo.a XLIB=-L/usr/local/X11R6/lib -lX11
# removed /usr/local/lib/liblanginfo.a from XLIB
XINCLUDES=-I/usr/X11R6/include XINCLUDES=-I/usr/local/X11R6/include
CFLAGS= CFLAGS=
PICFLAGS = PICFLAGS =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment