Skip to content
Snippets Groups Projects
Commit 6c664657 authored by layer's avatar layer
Browse files

join from acl62 to trunk on 8/14/2002

parent 1d085aaf
No related branches found
No related tags found
No related merge requests found
......@@ -10,12 +10,28 @@ 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 8/14/2002
command:
*********** THE FOLLOWING COMMAND IS WRONG:
./join.sh acl62 acl62_to_trunk_merge1 acl62_to_trunk_merge1 clim2
*********** IT SHOULD HAVE BEEN:
./join.sh acl62 acl62_to_trunk_merge1 acl62_to_trunk_merge2 clim2
*******************************************************************************
join from acl62 to trunk on 7/9/02
*******************************************************************************
<no version change>
2002-08-09 Duane Rettig <duane@beta>
* Makefile: Added power64 port
* Makefile.power64: New file for power64
*******************************************************************************
<no version change>
2002-06-08 Kevin Layer <layer@crikey>
* Makefile.macosx: work in progress
......
# $Header: /repo/cvs.copy/clim2/Makefile,v 1.91 2002/07/09 20:57:14 layer Exp $
# $Header: /repo/cvs.copy/clim2/Makefile,v 1.92 2002/08/14 17:49:28 layer Exp $
# If ../makefile.top doesn't exist, then you must specify HOST=xxx on the
# `make' command line.
......@@ -45,8 +45,12 @@ HOST = sgi4d-svr4
endif
ifeq ($(OS_NAME),aix)
ifeq ($(SIXTYFOURBIT),yes)
HOST = power64
else
HOST = rs6000
endif
endif
ifeq ($(OS_NAME),osf1)
ifeq ($(MACHINE),alpha)
......
# $Header: /repo/cvs.copy/clim2/Makefile.power64,v 1.2 2002/08/14 17:49:28 layer Exp $
#
# Makefile.rs6000 for CLIM 2.0
#
include Makefile.defs
Makefile=Makefile.power64
## For info on Motif1.2 vs Motif 2.1, see /usr/lpp/X11/README
##
CFLAGS = -q64 -DAcl64Bit -O -D_BSD -I/usr/include/Motif1.2
### the R5 directory contains Motif 1.2 on loveshaq
### -- what a botch. Can't use the latest X11 just because we want
### to use an older Motif! How I love AIX.... not!
SET_LIBRARY_PATH= \
LIBPATH=/usr/lpp/X11/lib/R6:/lib:/usr/lib; export LIBPATH; env
TKLIB=-L/usr/lpp/X11/lib/R6/Motif2.1 -lXm
XTLIB=-lXt
XLIB=-lX11
XINCLUDES= -I/usr/include/Motif2.1
PRODUCT-OBJS= $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(SHARED-XM-OBJS)
MAKE_SHARED = sh ../src/bin/make_shared.ibm64 -make_exp ../src/bin/make_exp
STD_DEFINES =
AR = ar -X64 clq
# This should be defined in make-dist. For CLIM devel (ie making
# slim images) we use climdcl-devel and don't use the shared library
IMPORTS = stub-x.o stub-xt.o stub-motif.o ../src/lisp.exp
stubs = c2stubs
include Makefile.generic
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