From 09581f9e59bad8e4fc5bdfe40ec5863e8973df0e Mon Sep 17 00:00:00 2001 From: cer <cer> Date: Mon, 1 Mar 1993 15:59:14 +0000 Subject: [PATCH] Makefile.dec3100, Makefile.generic, Makefile.defs Makefile hacking to ensure that on the dec make makeclimfasls makeclimobjs install_clim will only touch the motif objects --- Makefile.dec3100 | 6 +++++- Makefile.defs | 23 +++++++++++++++-------- Makefile.generic | 4 ++-- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Makefile.dec3100 b/Makefile.dec3100 index db559fb0..1767da1f 100644 --- a/Makefile.dec3100 +++ b/Makefile.dec3100 @@ -1,4 +1,4 @@ -# $fiHeader: Makefile,v 1.74 93/02/10 10:04:04 cer Exp $ +# $fiHeader: Makefile.dec3100,v 1.1 93/03/01 14:26:06 cer Exp $ # # Makefile.dec3100 for CLIM 2.0 # @@ -12,5 +12,9 @@ XLIB=/usr/lib/libX11.a MV=mv XINCLUDES=-I/usr/lib/DXM/lib -I/usr/lib/DXM/lib/Xt TMP=. +CLIM_FASLS_TO_MAKE = makeclimxmfasls +CLIMOBJS=$(GENERIC_PUBLIC_OBJS) $(XM_PUBLIC_OBJS) $(XM_LICENSED_OBJS) +CLIMFASLS= $(CLIM_XM_FASLS) $(CLIM_GENERIC_FASLS) +INSTALLED_CLIMOBJS=$(GENERIC_PUBLIC_OBJS) $(XM_PUBLIC_OBJS) $(XM_LICENSED_OBJS) include Makefile.generic diff --git a/Makefile.defs b/Makefile.defs index dbb965e9..5e7cc28f 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1,4 +1,4 @@ -# $fiHeader: Makefile,v 1.74 93/02/10 10:04:04 cer Exp $ +# $fiHeader: Makefile.defs,v 1.1 93/03/01 14:26:08 cer Exp $ # # Makefile.defs for CLIM 2.0 # @@ -105,23 +105,30 @@ OLC_UNDEFS=misc/undefinedsymbols.colit # These are the fasls and the .o that form the product -CLIMFASLS= climg.fasl climol.fasl climxm.fasl clim-debug.fasl clim-debugol.fasl \ - clim-debugxm.fasl climps.fasl climgg.fasl # clim1compat.fasl +CLIM_GENERIC_FASLS=climg.fasl clim-debug.fasl climps.fasl climgg.fasl +CLIM_OL_FASLS= climol.fasl clim-debugol.fasl +CLIM_XM_FASLS= climxm.fasl clim-debugxm.fasl +# clim1compat.fasl -PUBLIC_OBJS= stub-xt.o stub-x.o stub-olit.o stub-motif.o \ - xlibsupport.o MyDrawingA.o \ - olsupport.o xtsupport.o +CLIMFASLS= $(CLIM_GENERIC_FASLS) $(CLIM_OL_FASLS) $(CLIM_XM_FASLS) + +GENERIC_PUBLIC_OBJS= stub-xt.o stub-x.o xlibsupport.o xtsupport.o +XM_PUBLIC_OBJS= stub-motif.o MyDrawingA.o +OL_PUBLIC_OBJS= stub-olit.o olsupport.o + +PUBLIC_OBJS= $(GENERIC_PUBLIC_OBJS) $(XM_PUBLIC_OBJS) $(OL_PUBLIC_OBJS) OL_LICENSED_OBJS = clim-olit.o clim-olit_d.o XM_LICENSED_OBJS = clim-motif_d.o clim-motif.o -MOTIF_OBJS= clim-motif_d.o clim-motif.o xtsupport.o stub-xt.o stub-x.o stub-x.o xlibsupport.o MyDrawingA.o -OPENLOOK_OBJS= clim-olit_d.o clim-olit.o xtsupport.o stub-xt.o stub-x.o stub-x.o olsupport.o xlibsupport.o +MOTIF_OBJS= $(GENERIC_PUBLIC_OBJS) $(XM_PUBLIC_OBJS) $(XM_LICENSED_OBJS) +OPENLOOK_OBJS= $(GENERIC_PUBLIC_OBJS) $(OL_PUBLIC_OBJS) $(OL_LICENSED_OBJS) CLIMOBJS=$(PUBLIC_OBJS) $(XM_LICENSED_OBJS) $(OL_LICENSED_OBJS) INSTALLED_CLIMOBJS=$(PUBLIC_OBJS) $(XM_LICENSED_OBJS) $(OL_LICENSED_OBJS) +CLIM_FASLS_TO_MAKE = makeclimxmfasls makeclimolfasls # These are linked into the distribution # `pwd`/clim-olit_d.o \ `pwd`/clim-olit.o \ diff --git a/Makefile.generic b/Makefile.generic index 6c7854cc..380aba95 100644 --- a/Makefile.generic +++ b/Makefile.generic @@ -1,4 +1,4 @@ -# $fiHeader: Makefile,v 1.74 93/02/10 10:04:04 cer Exp $ +# $fiHeader: Makefile.generic,v 1.1 93/03/01 14:26:10 cer Exp $ # # Makefile.generic for CLIM 2.0 # @@ -221,7 +221,7 @@ FORCE: ################## Make-dist stuff -makeclimfasls : makeclimxmfasls makeclimolfasls +makeclimfasls : $(CLIM_FASLS_TO_MAKE) makeclimxmfasls : compile-xm cat-xm makeclimolfasls : compile-ol cat-ol -- GitLab