Skip to content
Snippets Groups Projects
Commit 5dc56b16 authored by duane's avatar duane
Browse files

see 4.2.devel.22 changelog entry for Fri Dec 3 15:28:36 1993

parent 4e587764
No related branches found
No related tags found
No related merge requests found
Fri Dec 3 15:28:36 1993 Duane Rettig (duane at clay)
(for 4.2.devel.22 merge):
* clim-2.0/Makefile.cobjs-svr4: Add PICFLAGS/SHAREFLAGS;
temporarily remove mainxm.o build
* clim-2.0/Makefile.hpprism: Add CFLAGS default
* clim-2.0/Makefile.sgi4d-svr4: New file
* clim-2.0/Makefile.sun4-svr4: Add PICFLAGS/SHAREFLAGS
* clim-2.0/misc/xtsupport.c: Fix include references
Tue Nov 23 12:02:05 1993 Duane Rettig (duane at clay)
(for 4.2.devel.21 merge):
......
......@@ -2,30 +2,34 @@
climol.so: xlibsupport.o xtsupport.o olsupport.o
(test -f $(setup_LLP) && eval `$(setup_LLP) openlook`; \
ld -G -o climol.so xlibsupport.o xtsupport.o olsupport.o \
ld $(SHAREFLAGS) -o climol.so xlibsupport.o xtsupport.o olsupport.o \
-lXol -lXt -lX11)
climxm.so: xlibsupport.o xtsupport.o MyDrawingA.o
(test -f $(setup_LLP) && eval `$(setup_LLP) motif`; \
ld -G -o climxm.so xlibsupport.o xtsupport.o MyDrawingA.o \
ld $(SHAREFLAGS) -o climxm.so xlibsupport.o xtsupport.o MyDrawingA.o \
-lXm -lXt -lX11 -lgen)
xlibsupport.o : xlib/xlibsupport.c
$(CC) -c -K pic $(CFLAGS) $(XINCLUDES) -o xlibsupport.o \
$(CC) -c $(PICFLAGS) $(CFLAGS) $(XINCLUDES) -o xlibsupport.o \
xlib/xlibsupport.c
xtsupport.o: misc/xtsupport.c
$(CC) -c -K pic $(CFLAGS) $(XINCLUDES) $(XTSUPPORTINCLUDES)\
$(CC) -c $(PICFLAGS) $(CFLAGS) $(XINCLUDES) $(XTSUPPORTINCLUDES)\
-o xtsupport.o misc/xtsupport.c
MyDrawingA.o: misc/MyDrawingA.c misc/climgccursor.c
$(CC) -c -K pic $(CFLAGS) $(XMINCLUDES) -o MyDrawingA.o \
$(CC) -c $(PICFLAGS) $(CFLAGS) $(XMINCLUDES) -o MyDrawingA.o \
misc/MyDrawingA.c
olsupport.o: misc/olsupport.c misc/climgccursor.c
$(CC) -c -K pic $(CFLAGS) $(OLINCLUDES) -o olsupport.o misc/olsupport.c
$(CC) -c $(PICFLAGS) $(CFLAGS) $(OLINCLUDES) -o olsupport.o misc/olsupport.c
$(MAIN_OBJ): stub-motif.o stub-xt.o stub-x.o
ld -r $(LDFLAGS) -o $(MAIN_OBJ) $(ACL_MAIN_OBJ) \
xlibsupport.o xtsupport.o MyDrawingA.o stub-motif.o stub-xt.o \
stub-x.o -lXm -lXt -lX11 -lgen
# not needed for svr4?
# $(MAIN_OBJ): stub-motif.o stub-xt.o stub-x.o
# ld -r $(LDFLAGS) -o $(MAIN_OBJ) $(ACL_MAIN_OBJ) \
# xlibsupport.o xtsupport.o MyDrawingA.o stub-motif.o stub-xt.o \
# stub-x.o -lXm -lXt -lX11 -lgen
$(MAIN_OBJ):
cp $(ACL_MAIN_OBJ) $(MAIN_OBJ)
......@@ -9,6 +9,8 @@ Makefile=Makefile.hp700
CL=/usr/fi/dcl-devel
CFLAGS = -O -D_NO_PROTO -DSTRINGS_ALIGNED -DNO_REGEX -DNO_ISDIR -DUSE_RE_COMP -DUSER_GETWD -Wp,-H1280000
#
MOTIFLIB=/usr/lib/Motif1.2/libXm.a
......
# $fiHeader: Makefile.svr4,v 1.3 1993/05/13 16:22:49 cer Exp $
include Makefile.defs
Makefile=Makefile.sgi4d-svr4
MOTIFHOME=
MOTIFLIB=
MOTIFLIB_d=$(MOTIFHOME)/usr/lib/libXm.a
XLIB=$(MOTIFHOME)/usr/lib/libX11$(DEBUGLIB).a
XTLIB=$(MOTIFHOME)/usr/lib/libXt$(DEBUGLIB).a
XINCLUDES=-I$(MOTIFHOME)/usr/include
XMINCLUDES=-I$(MOTIFHOME)/usr/include
MOTIFXTRAOS=
###############################################################################
setup_LLP = /net/vapor/scm/bin/setup_LLP
C_OBJECT_MAKEFILE = Makefile.cobjs-svr4
XLIB-CLIM-OBJS = xlib/pkg.fasl
GENERIC_PUBLIC_OBJS =
XM_PUBLIC_OBJS =
OL_PUBLIC_OBJS =
PUBLIC_OBJS =
OL_LICENSED_OBJS =
XM_LICENSED_OBJS =
MOTIF_OBJS = climxm.so
OPENLOOK_OBJS =
CLIMOBJS= climxm.so
CLIMFASLS= $(CLIM_XM_FASLS) $(CLIM_GENERIC_FASLS)
INSTALLED_CLIMXMOBJS = MyDrawingA.o climxm.so
INSTALLED_CLIMOBJS= xlibsupport.o xtsupport.o $(INSTALLED_CLIMXMOBJS)
PICFLAGS = -KPIC
SHAREFLAGS = -shared -all
PWD = .
###############################################################################
include Makefile.generic
......@@ -41,6 +41,9 @@ INSTALLED_CLIMOLOBJS = olsupport.o climol.so
INSTALLED_CLIMOBJS= xlibsupport.o xtsupport.o \
$(INSTALLED_CLIMOLOBJS) $(INSTALLED_CLIMXMOBJS)
PICFLAGS = -K pic
SHAREFLAGS = -G
PWD = .
###############################################################################
......
......@@ -4,8 +4,8 @@
#include <signal.h>
#include <stdio.h>
#include "IntrinsicP.h"
#include "CoreP.h"
#include <X11/IntrinsicP.h>
#include <X11/CoreP.h>
#ifdef sparc
#include "IntrinsicI.h"
......
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