--- a/Make.proto Fri Nov 21 16:39:44 2003 +0100
+++ b/Make.proto Fri Nov 21 21:04:17 2003 +0100
@@ -14,12 +14,6 @@
TOP=..
SUBDIRS=
-MODULE=stx
-MODULE_DIR=libtool2
-LIBNAME=libtool2
-THIS_IS_A_BASE_LIBRARY="yes"
-
-PACKAGE=$(MODULE):$(LIBNAME)
LIB_BASE=$(LIBTOOL2_BASE)
NM_LIB_BASE=LIBTOOL2_BASE
@@ -29,33 +23,6 @@
all:: classLibRule
-O=$(O2)
-
-IOBJS= \
- $(OUTDIR)NewInspectorList.$(O) \
- $(OUTDIR)NewInspectorListView.$(O) \
- $(OUTDIR)NewInspectorView.$(O) \
- $(OUTDIR)NewInspectorPanelView.$(O)
-
-OBJS= \
- $(LIBTOOL2_PACKAGE_OBJS) \
- $(OUTDIR)ColorMenu.$(O) \
- $(OUTDIR)FontMenu.$(O) \
- $(OUTDIR)MenuEditor.$(O) \
- $(OUTDIR)ImageEditor.$(O) \
- $(OUTDIR)DataSetBuilder.$(O) \
- $(OUTDIR)UIGalleryView.$(O) \
- $(OUTDIR)UIHelpTool.$(O) \
- $(OUTDIR)UILayoutTool.$(O) \
- $(OUTDIR)UIObjectView.$(O) \
- $(OUTDIR)UIPainter.$(O) \
- $(OUTDIR)UIPainterView.$(O) \
- $(OUTDIR)UISelectionPanel.$(O) \
- $(OUTDIR)UISpecificationTool.$(O) \
- $(OUTDIR)SelectionBrowser.$(O) \
- $(OUTDIR)FileSelectionBrowser.$(O) \
- $(OUTDIR)ResourceSelectionBrowser.$(O)
-
cleanjunk::
@-rm -f *.s *.s2 *.c *.H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Make.spec Fri Nov 21 21:04:17 2003 +0100
@@ -0,0 +1,34 @@
+# $Header$
+
+# -------------- no need to change anything below ----------
+
+MODULE=stx
+MODULE_DIR=libtool2
+LIBNAME=libtool2
+PACKAGE=$(MODULE):$(LIBNAME)
+THIS_IS_A_BASE_LIBRARY="yes"
+
+IOBJS= \
+ $(OUTDIR)NewInspectorList.$(O) \
+ $(OUTDIR)NewInspectorListView.$(O) \
+ $(OUTDIR)NewInspectorView.$(O) \
+ $(OUTDIR)NewInspectorPanelView.$(O)
+
+OBJS= \
+ $(LIBTOOL2_PACKAGE_OBJS) \
+ $(OUTDIR)ColorMenu.$(O) \
+ $(OUTDIR)FontMenu.$(O) \
+ $(OUTDIR)MenuEditor.$(O) \
+ $(OUTDIR)ImageEditor.$(O) \
+ $(OUTDIR)DataSetBuilder.$(O) \
+ $(OUTDIR)UIGalleryView.$(O) \
+ $(OUTDIR)UIHelpTool.$(O) \
+ $(OUTDIR)UILayoutTool.$(O) \
+ $(OUTDIR)UIObjectView.$(O) \
+ $(OUTDIR)UIPainter.$(O) \
+ $(OUTDIR)UIPainterView.$(O) \
+ $(OUTDIR)UISelectionPanel.$(O) \
+ $(OUTDIR)UISpecificationTool.$(O) \
+ $(OUTDIR)SelectionBrowser.$(O) \
+ $(OUTDIR)FileSelectionBrowser.$(O) \
+ $(OUTDIR)ResourceSelectionBrowser.$(O)
--- a/bc.mak Fri Nov 21 16:39:44 2003 +0100
+++ b/bc.mak Fri Nov 21 21:04:17 2003 +0100
@@ -8,10 +8,9 @@
#
!INCLUDE $(TOP)\rules\stdHeader_nt
#
-MODULE=stx
-MODULE_DIR=libtool2
-PACKAGE=$(MODULE):$(MODULE_DIR)
-LIBNAME=libtool2
+!INCLUDE Make.spec
+#
+
LIB_BASE_LD_ARG=$(LIBTOOL2_BASE_LD_ARG)
STCOPT="-warnNonStandard"
STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
@@ -19,29 +18,8 @@
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
-
-OBJS=\
- $(OUTDIR)ColorMenu.$(O) \
- $(OUTDIR)FontMenu.$(O) \
- $(OUTDIR)MenuEditor.$(O) \
- $(OUTDIR)ImageEditor.$(O) \
- $(OUTDIR)DataSetBuilder.$(O) \
- $(OUTDIR)UIGalleryView.$(O) \
- $(OUTDIR)UIHelpTool.$(O) \
- $(OUTDIR)UILayoutTool.$(O) \
- $(OUTDIR)UIObjectView.$(O) \
- $(OUTDIR)UIPainter.$(O) \
- $(OUTDIR)UIPainterView.$(O) \
- $(OUTDIR)UISelectionPanel.$(O) \
- $(OUTDIR)UISpecificationTool.$(O) \
- $(OUTDIR)SelectionBrowser.$(O) \
- $(OUTDIR)FileSelectionBrowser.$(O) \
- $(OUTDIR)ResourceSelectionBrowser.$(O)
-
-
!INCLUDE $(TOP)\rules\stdRules_nt
-
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)ColorMenu.$(O) ColorMenu.$(H): ColorMenu.st $(STCHDR) $(INCL)MenuPanel.$(H) $(INCL)SimpleView.$(H) $(INCL)DisplaySurface.$(H) $(INCL)GraphicsMedium.$(H) $(INCL)DeviceGraphicsContext.$(H) $(INCL)GraphicsContext.$(H) $(INCL)Object.$(H) $(INCL)SimpleDialog.$(H) $(INCL)ApplicationModel.$(H) $(INCL)Model.$(H)
$(OUTDIR)DataSetBuilder.$(O) DataSetBuilder.$(H): DataSetBuilder.st $(STCHDR) $(INCL)ResourceSpecEditor.$(H) $(INCL)ToolApplicationModel.$(H) $(INCL)ApplicationModel.$(H) $(INCL)Model.$(H) $(INCL)Object.$(H) $(INCL)Array.$(H) $(INCL)ArrayedCollection.$(H) $(INCL)SequenceableCollection.$(H) $(INCL)Collection.$(H)
--- a/nt.mak Fri Nov 21 16:39:44 2003 +0100
+++ b/nt.mak Fri Nov 21 21:04:17 2003 +0100
@@ -8,10 +8,9 @@
#
!INCLUDE $(TOP)\rules\stdHeader_nt
#
-MODULE=stx
-MODULE_DIR=libtool2
-PACKAGE=$(MODULE):$(MODULE_DIR)
-LIBNAME=libtool2
+!INCLUDE Make.spec
+#
+
LIB_BASE_LD_ARG=$(LIBTOOL2_BASE_LD_ARG)
STCOPT="-warnNonStandard"
STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
@@ -19,29 +18,8 @@
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
-
-OBJS=\
- $(OUTDIR)ColorMenu.$(O) \
- $(OUTDIR)FontMenu.$(O) \
- $(OUTDIR)MenuEditor.$(O) \
- $(OUTDIR)ImageEditor.$(O) \
- $(OUTDIR)DataSetBuilder.$(O) \
- $(OUTDIR)UIGalleryView.$(O) \
- $(OUTDIR)UIHelpTool.$(O) \
- $(OUTDIR)UILayoutTool.$(O) \
- $(OUTDIR)UIObjectView.$(O) \
- $(OUTDIR)UIPainter.$(O) \
- $(OUTDIR)UIPainterView.$(O) \
- $(OUTDIR)UISelectionPanel.$(O) \
- $(OUTDIR)UISpecificationTool.$(O) \
- $(OUTDIR)SelectionBrowser.$(O) \
- $(OUTDIR)FileSelectionBrowser.$(O) \
- $(OUTDIR)ResourceSelectionBrowser.$(O)
-
-
!INCLUDE $(TOP)\rules\stdRules_nt
-
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)ColorMenu.$(O) ColorMenu.$(H): ColorMenu.st $(STCHDR) $(INCL)MenuPanel.$(H) $(INCL)SimpleView.$(H) $(INCL)DisplaySurface.$(H) $(INCL)GraphicsMedium.$(H) $(INCL)DeviceGraphicsContext.$(H) $(INCL)GraphicsContext.$(H) $(INCL)Object.$(H) $(INCL)SimpleDialog.$(H) $(INCL)ApplicationModel.$(H) $(INCL)Model.$(H)
$(OUTDIR)DataSetBuilder.$(O) DataSetBuilder.$(H): DataSetBuilder.st $(STCHDR) $(INCL)ResourceSpecEditor.$(H) $(INCL)ToolApplicationModel.$(H) $(INCL)ApplicationModel.$(H) $(INCL)Model.$(H) $(INCL)Object.$(H) $(INCL)Array.$(H) $(INCL)ArrayedCollection.$(H) $(INCL)SequenceableCollection.$(H) $(INCL)Collection.$(H)