--- a/Make.proto Fri Sep 03 17:36:50 1999 +0200
+++ b/Make.proto Mon Sep 06 14:14:28 1999 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libcomp/Make.proto,v 1.63 1999-09-03 09:49:54 cg Exp $
+# $Header: /cvs/stx/stx/libcomp/Make.proto,v 1.64 1999-09-06 12:14:27 cg Exp $
#
# -------------- no need to change anything below ----------
@@ -17,128 +17,53 @@
LOCALDEFS=$(DLDEFS)
-DELIVERBINARIES=lib*.$(O) lib*.so lib*.a $(LIBCOMP_EXTRA_TARGETS)
-
-all:: classLibRule $(LIBCOMP_EXTRA_TARGETS)
+DELIVERBINARIES=lib*.$(O) lib*.so lib*.a
-#
-# although all files are compiled in here,
-# not everything goes into the target library
-# ObjFLoader is optional
-#
-LINKOBJS=`ls *.o \
- | grep -v ObjFLoader.$(O) \
- | grep -v libcompInit.$(O) \
- | grep -v i_ | $(TOP)/rules/tr_NL_2_Space`
+all:: classLibRule
#
# these are uncritical - save some bytes by compiling with optspace
#
UNCRITICALOBJS=\
- Explainer.$(O)
-
-WIN_OBJS= \
- ObjFLoader.$(O)
-
-# later:
-#VMS_OBJS= \
-# ObjFLoader.$(O)
-
-OBJS= \
- Scanner.$(O) \
- Parser.$(O) \
- BCompiler.$(O) \
- Explainer.$(O) \
- ProgramNodeEnumerator.$(O) \
- Variable.$(O) \
- ParseNode.$(O) \
- PrimaryNd.$(O) \
- VarNode.$(O) \
- SelfNode.$(O) \
- SuperNode.$(O) \
- ConstNode.$(O) \
- StatNode.$(O) \
- RetNode.$(O) \
- PrimNd.$(O) \
- AssignNd.$(O) \
- BlockNode.$(O) \
- MessageNd.$(O) \
- UnaryNd.$(O) \
- BinaryNd.$(O) \
- CascadeNd.$(O) \
- UndefVar.$(O) \
- LazyMethod.$(O) \
- SrcFLoader.$(O) \
- ImmArray.$(O) \
- ObjFHandle.$(O) \
- Structure.$(O) \
- SyntaxHighlighter.$(O) \
- $(EXTRA_LIBCOMP)
-
-#
-# only needed for NeXT2.1 - assembler dumps core with long name ?!?!
-#
-# VarNode.$(O):
-# $(STC) -CC="$(CC)" $(STCFLAGS) $(SOMESHORTNAMES) $(CFLAGS) -c $*.st
+ Explainer.$(O) \
+ ProgramNodeEnumerator.$(O)\
+ SyntaxHighlighter.$(O)
-#
-# ObjFLoader is a separate (shared) Object - compile without sepInitCode
-# and without -Zlibcomp (to speedup ld.so on SGI, by avoiding conflicts)
-#
-ObjFLoader.$(O):
- $(MAKE) $(SPEEDOPT_O_RULE) STCOPT="$(STCOPT)" SEPINITCODE=-sepInitCode OPT="$(OPT)" STFILE=ObjFLoader ZFLAG=
-
-ObjFLoader.c:
- $(MAKE) $(C_RULE) STCOPT="$(STCOPT)" SEPINITCODE=-sepInitCode OPT="$(OPT)" STFILE=ObjFLoader
-
-#
-# on HP, big classes blow the C-preprocessor (stops with 'too much defining' error)
-#
-#HP:: HPbigFiles
-#
-#HPbigFiles:
-# $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=Parser CC=$(CC) OPT="$(OPT)"
-# $(MAKE) $(BIG_STFILE_RULE) BIG_FILE=BCompiler CC=$(CC) OPT="$(OPT)"
-
-AIX_SHARED_OBJFILELOADER:
- $(MAKE) ObjFLoader$(O_EXT) \
- ENTRY_INIT=ObjectFileLoader \
- AIX_LOCAL_LIBS=""
-
-AIX:: $(AIX_OBJFILELOADER_RULE)
-
-
-#
-# install the extra objects
-#
-qinstall:: $(DESTLIBDIR)
- if [ "$(EXTRA_LIBCOMP)"x != "x" ]; then \
- $(INSTALL) $(EXTRA_LIBCOMP) $(DESTLIBDIR); \
- fi
-
-#
-# ObjectFileLoader is not included in
-# the classLibrary (but as extra objects)
-#
-specialClassList:
- $(MAKE) genClassList
- grep -v ObjectFileLoader < classList.stc > ttt
- mv ttt classList.stc
-
-CLASSLISTRULE=specialClassList
+OBJS=\
+ Scanner.$(O) \
+ Parser.$(O) \
+ BCompiler.$(O) \
+ Explainer.$(O) \
+ ProgramNodeEnumerator.$(O)\
+ Variable.$(O) \
+ ParseNode.$(O) \
+ PrimaryNd.$(O) \
+ VarNode.$(O) \
+ SelfNode.$(O) \
+ SuperNode.$(O) \
+ ConstNode.$(O) \
+ StatNode.$(O) \
+ RetNode.$(O) \
+ PrimNd.$(O) \
+ AssignNd.$(O) \
+ BlockNode.$(O) \
+ MessageNd.$(O) \
+ UnaryNd.$(O) \
+ BinaryNd.$(O) \
+ CascadeNd.$(O) \
+ UndefVar.$(O) \
+ LazyMethod.$(O) \
+ SrcFLoader.$(O) \
+ ImmArray.$(O) \
+ ObjFHandle.$(O) \
+ Structure.$(O) \
+ SyntaxHighlighter.$(O) \
+ ObjFLoader.$(O)
cleanjunk::
@-rm -f *.c *.H
clean::
- @-rm -f __ObjFLoader.$(O)
- @-if test -f ObjFloader.$(O); then \
- mv ObjFloader.$(O) __ObjFLoader.$(O); \
- else true; fi
- @-rm -f [A-Z]*.$(O)
- @-if test -f __ObjFLoader.$(O); then \
- mv __ObjFLoader.$(O) ObjFloader.$(O); \
- else true; fi
@-rm -f *.c *.H
clobber::