--- a/Make.proto Mon Sep 18 21:51:16 2006 +0200
+++ b/Make.proto Tue Sep 19 12:53:23 2006 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview/Make.proto,v 1.145 2006-09-14 18:14:51 stefan Exp $
+# $Header: /cvs/stx/stx/libview/Make.proto,v 1.146 2006-09-19 10:53:23 stefan Exp $
#
# -------------- no need to change anything below ----------
@@ -26,7 +26,7 @@
OBJS=$(COMMON_OBJS) $(UNIX_OBJS)
-all:: abbrev.stc objs classList.stc $(OBJTARGET) $(LIBVIEW_EXTRA_TARGETS)
+all:: abbrev.stc objs $(OBJTARGET) $(LIBVIEW_EXTRA_TARGETS)
showOBJS:
echo NOTINLIBOBJS=$(NOTINLIBOBJS)
@@ -34,42 +34,20 @@
echo LIBVIEW_EXTRA_TARGETS=$(LIBVIEW_EXTRA_TARGETS)
smalllib:
- @-rm -f classList.stc
@-rm -f libViewInit.o
$(MAKE) objs \
LIBNAME=$(SMALLLIBNAME) \
OBJS="$(REQUIREDOBJS)" \
LINKOBJS="$(SMALLOBJFILES)" \
GENCLASSLIST_RULE=genClassList
- $(MAKE) classList.stc \
- GENCLASSLIST_RULE=genClassList \
- LIBNAME=$(SMALLLIBNAME) \
- OBJS="$(REQUIREDOBJS)" \
- LINKOBJS="$(SMALLOBJFILES)"
$(MAKE) obj$(TARGET_RULE_EXTENSION) \
LIBNAME=$(SMALLLIBNAME) \
OBJS="$(REQUIREDOBJS)" \
LINKOBJS="$(SMALLOBJFILES)" \
GENCLASSLIST_RULE=genClassList
- @-rm -f classList.stc
@-rm -f libViewInit.o
@-rm -f libInit.cc
-#
-# NXWorkstation, XWorkstation and GLXWorkstation are not included in
-# the classLibrary (but as extra objects)
-#
-specialClassList:
- $(MAKE) $(GENCLASSLIST_RULE) GENCLASSLIST_RULE=$(GENCLASSLIST_RULE) LIBNAME=$(LIBNAME) OBJS="$(OBJS)" LINKOBJS="$(LINKOBJS)"
- @if test -f classList.stc; then \
- grep -v $(WORKSTAT1) < classList.stc > ttt; \
- mv ttt classList.stc; \
- grep -v $(WORKSTAT2) < classList.stc > ttt; \
- mv ttt classList.stc; \
- fi
-
-CLASSLISTRULE=specialClassList
-
cleanjunk::
@-rm -f *.c *.s *.s2 *.H
@@ -86,7 +64,7 @@
@-touch $(OUTDIR)XWorkstation.st $(OUTDIR)GLXWorkstation.st
clobber::
- @-rm -f *.so *.o *.c *.H classList.stc abbrev.stc
+ @-rm -f *.so *.o *.c *.H
#
# XWorkstatation and GLXWorkstatation are separate (shared) Objects - compile without sepInitCode