--- a/Make.proto Fri Nov 21 16:04:41 2003 +0100
+++ b/Make.proto Fri Nov 21 16:39:44 2003 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview/Make.proto,v 1.134 2003-10-29 10:45:21 cg Exp $
+# $Header: /cvs/stx/stx/libview/Make.proto,v 1.135 2003-11-21 15:39:44 cg Exp $
#
# -------------- no need to change anything below ----------
@@ -21,8 +21,6 @@
LOCALDEFS=-I$(XINCLUDE) $(XDEFS) $(CC_3D_FLAGS)
-RCSSOURCES=*.st Make.proto styles/*.style resources/*.rs
-
DELIVERBINARIES=lib*.o lib*.a lib*.so $(LIBVIEW_EXTRA_TARGETS)
all:: abbrev.stc objs $(NOTINLIBOBJS) classList.stc $(OBJTARGET) $(LIBVIEW_EXTRA_TARGETS)
@@ -45,75 +43,69 @@
grep -v $(WORKSTAT1) < liblist.stc | grep -v $(WORKSTAT2) > ttt
mv ttt liblist.stc
-SMALLOBJFILES= \
- GraphicsDevice.$(O) \
- HostGraphicsDevice.$(O) \
- DeviceWorkstation.$(O) \
- Image.$(O) \
- Depth1Image.$(O) Depth2Image.$(O) Depth4Image.$(O) \
- Depth8Image.$(O) Depth24Image.$(O) \
- ImageReader.$(O)
-
NOTINLIBOBJS= \
- $(WORKSTAT1).$(O) \
- $(WORKSTAT2).$(O)
+ $(OUTDIR)$(WORKSTAT1).$(O) \
+ $(OUTDIR)$(WORKSTAT2).$(O)
REQUIREDOBJS= \
- GraphicsDevice.$(O) \
- HostGraphicsDevice.$(O) \
- DeviceWorkstation.$(O) \
- Image.$(O) \
- Depth1Image.$(O) \
- Depth2Image.$(O) \
- Depth4Image.$(O) \
- Depth8Image.$(O) \
- Depth24Image.$(O) \
- ImageReader.$(O)
+ $(OUTDIR)GraphicsDevice.$(O) \
+ $(OUTDIR)HostGraphicsDevice.$(O) \
+ $(OUTDIR)DeviceWorkstation.$(O) \
+ $(OUTDIR)Image.$(O) \
+ $(OUTDIR)Depth1Image.$(O) \
+ $(OUTDIR)Depth2Image.$(O) \
+ $(OUTDIR)Depth4Image.$(O) \
+ $(OUTDIR)Depth8Image.$(O) \
+ $(OUTDIR)Depth24Image.$(O) \
+ $(OUTDIR)ImageReader.$(O)
+
+SMALLOBJFILES= \
+ $(REQUIREDOBJS)
#
# those can be compiled for space - not time critical
#
UNCRITICALOBJS= \
- DisplayRootView.$(O) \
- AlphaMask.$(O)
+ $(OUTDIR)DisplayRootView.$(O) \
+ $(OUTDIR)AlphaMask.$(O)
LIBOBJS= \
$(REQUIREDOBJS) \
- Color.$(O) \
- Colormap.$(O) \
- ColorPalette.$(O) \
- MappedPalette.$(O) \
- MonoMappedPalette.$(O) \
- FontDescription.$(O) \
- Font.$(O) \
- Cursor.$(O) \
- DeviceHandle.$(O) \
- GraphicsContext.$(O) \
- DeviceGraphicsContext.$(O) \
- GraphicsMedium.$(O) \
- Form.$(O) \
- DisplaySurface.$(O) \
- SimpleView.$(O) \
- View.$(O) \
- TopView.$(O) \
- StandardSystemView.$(O) \
- ModalBox.$(O) \
- PopUpView.$(O) \
- ShadowView.$(O) \
- DisplayRootView.$(O) \
- Controller.$(O) \
- WindowingTransformation.$(O) \
- WindowEvent.$(O) \
- WindowGroup.$(O) \
- WindowSensor.$(O) \
- SynchronousWindowSensor.$(O) \
- KeyboardForwarder.$(O) \
- KeyboardMap.$(O) \
- ResourcePack.$(O) \
- ViewStyle.$(O) \
- Depth16Image.$(O) \
- Depth32Image.$(O) \
- ImageMask.$(O)
+ $(OUTDIR)Color.$(O) \
+ $(OUTDIR)Colormap.$(O) \
+ $(OUTDIR)ColorPalette.$(O) \
+ $(OUTDIR)MappedPalette.$(O) \
+ $(OUTDIR)MonoMappedPalette.$(O) \
+ $(OUTDIR)FontDescription.$(O) \
+ $(OUTDIR)Font.$(O) \
+ $(OUTDIR)Cursor.$(O) \
+ $(OUTDIR)DeviceHandle.$(O) \
+ $(OUTDIR)GraphicsContext.$(O) \
+ $(OUTDIR)DeviceGraphicsContext.$(O) \
+ $(OUTDIR)GraphicsMedium.$(O) \
+ $(OUTDIR)Form.$(O) \
+ $(OUTDIR)DisplaySurface.$(O) \
+ $(OUTDIR)SimpleView.$(O) \
+ $(OUTDIR)View.$(O) \
+ $(OUTDIR)TopView.$(O) \
+ $(OUTDIR)StandardSystemView.$(O) \
+ $(OUTDIR)ModalBox.$(O) \
+ $(OUTDIR)PopUpView.$(O) \
+ $(OUTDIR)ShadowView.$(O) \
+ $(OUTDIR)DisplayRootView.$(O) \
+ $(OUTDIR)Controller.$(O) \
+ $(OUTDIR)WindowingTransformation.$(O) \
+ $(OUTDIR)WindowEvent.$(O) \
+ $(OUTDIR)WindowGroup.$(O) \
+ $(OUTDIR)WindowSensor.$(O) \
+ $(OUTDIR)SynchronousWindowSensor.$(O) \
+ $(OUTDIR)KeyboardForwarder.$(O) \
+ $(OUTDIR)KeyboardMap.$(O) \
+ $(OUTDIR)ResourcePack.$(O) \
+ $(OUTDIR)ViewStyle.$(O) \
+ $(OUTDIR)Depth16Image.$(O) \
+ $(OUTDIR)Depth32Image.$(O) \
+ $(OUTDIR)ImageMask.$(O)
OBJS = \
$(LIBOBJS) \
@@ -165,32 +157,18 @@
# Save them, but make sure that they are rebuild on next make!
#
clean::
- @-mv XWorkstation.o XWorkstation.o.sav
- @-mv GLXWorkstation.o GLXWorkstation.o.sav
+ @-mv $(OUTDIR)XWorkstation.o $(OUTDIR)XWorkstation.o.sav
+ @-mv $(OUTDIR)GLXWorkstation.o $(OUTDIR)GLXWorkstation.o.sav
@-rm -f [A-Z]*.o *.s *.s2 *.c *.H
- @-mv XWorkstation.o.sav XWorkstation.o
- @-mv GLXWorkstation.o.sav GLXWorkstation.o
- @-touch XWorkstation.st GLXWorkstation.st
+ @-mv $(OUTDIR)XWorkstation.o.sav $(OUTDIR)XWorkstation.o
+ @-mv $(OUTDIR)GLXWorkstation.o.sav $(OUTDIR)GLXWorkstation.o
+ @-touch $(OUTDIR)XWorkstation.st $(OUTDIR)GLXWorkstation.st
clobber::
@-rm -f *.so *.o *.c *.H classList.stc abbrev.stc
-tar:
- (cd $(TOP); tar cvfh DISTRIB/libview.tar \
- libview/.dir.info \
- libview/*.st \
- libview/Make.proto \
- libview/styles/.dir.info \
- libview/styles/*.style \
- libview/styles/*.common \
- libview/resources/*.rs)
-
#
-# special BIG-rule (kludge for HP / ibm)
-#
-
-#
-# also, XWorkstatation and GLXWorkstatation are separate (shared) Objects - compile without sepInitCode
+# XWorkstatation and GLXWorkstatation are separate (shared) Objects - compile without sepInitCode
# and without -Zlibview (to speedup ld.so on SGI, by avoiding conflicts)
#