.
--- a/Make.proto Wed Oct 25 14:49:02 1995 +0100
+++ b/Make.proto Fri Oct 27 15:40:52 1995 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview/Make.proto,v 1.43 1995-10-23 16:59:57 cg Exp $
+# $Header: /cvs/stx/stx/libview/Make.proto,v 1.44 1995-10-27 14:40:52 cg Exp $
#
# -------------- no need to change anything below ----------
@@ -54,7 +54,6 @@
OBJS= \
$(REQUIREDOBJS) \
- $(NOTINLIBOBJS) \
Workstat.$(O) \
Color.$(O) \
Colormap.$(O) \
@@ -86,8 +85,9 @@
ImageRdr.$(O) \
RsrcPack.$(O) \
ViewStyle.$(O) \
- $(MOREOBJS) \
- Depth16Image.$(O)
+ Depth16Image.$(O) \
+ $(MOREOBJS) \
+ $(NOTINLIBOBJS)
smalllib:
@-rm classList.stc
@@ -160,17 +160,20 @@
#
AIX:
$(MAKE) DevWorkst.o
+ $(MAKE) Image.o
$(MAKE) OPT=-O2
#
# install the extra objects
#
qinstall:: $(DESTLIBDIR)
- if [ "$(WORKSTAT1)"x != "x" ]; then \
- $(INSTALL) $(WORKSTAT1).$(O) $(DESTLIBDIR); \
+ if [ "$(WORKSTAT1)"x != "x" ]; then \
+ $(INSTALL_LIB) $(WORKSTAT1).$(O) $(DESTLIBDIR); \
fi
- if [ "$(WORKSTAT2)"x != "x" ]; then \
- $(INSTALL) $(WORKSTAT2).$(O) $(DESTLIBDIR); \
+ if [ "$(WORKSTAT2)"x != "$(WORKSTAT1"x ]; then \
+ if [ "$(WORKSTAT2)"x != "x" ]; then \
+ $(INSTALL_LIB) $(WORKSTAT2).$(O) $(DESTLIBDIR); \
+ fi \
fi
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it