--- a/Make.proto Fri Nov 21 16:39:44 2003 +0100
+++ b/Make.proto Fri Nov 21 20:52:47 2003 +0100
@@ -1,16 +1,10 @@
-# $Header: /cvs/stx/stx/libwidg2/Make.proto,v 1.114 2003-11-21 15:39:44 cg Exp $
+# $Header: /cvs/stx/stx/libwidg2/Make.proto,v 1.115 2003-11-21 19:51:50 cg Exp $
#
# -------------- no need to change anything below ----------
TOP=..
SUBDIRS=
-MODULE=stx
-MODULE_DIR=libwidg2
-LIBNAME=libwidg2
-THIS_IS_A_BASE_LIBRARY="yes"
-
-PACKAGE=$(MODULE):$(LIBNAME)
LIB_BASE=$(LIBWIDG2_BASE)
NM_LIB_BASE=LIBWIDG2_BASE
@@ -20,66 +14,6 @@
all:: classLibRule
-OBJS= \
- $(LIBWIDG2_PACKAGE_OBJS) \
- $(OUTDIR)LicenceBox.$(O) \
- $(OUTDIR)SubCanvas.$(O) \
- $(OUTDIR)Slider.$(O) \
- $(OUTDIR)HorizontalSlider.$(O) \
- $(OUTDIR)LabelledEnterField.$(O) \
- $(OUTDIR)FilenameEnterBox.$(O) \
- $(OUTDIR)FilenameEditField.$(O) \
- $(OUTDIR)CheckBox.$(O) \
- $(OUTDIR)Separator.$(O) \
- $(OUTDIR)TabulatorSpecification.$(O) \
- $(OUTDIR)TabSpecRuler.$(O) \
- $(OUTDIR)ListEntry.$(O) \
- $(OUTDIR)MultiColListEntry.$(O) \
- $(OUTDIR)ModelListEntry.$(O) \
- $(OUTDIR)LabelAndIcon.$(O) \
- $(OUTDIR)ComboView.$(O) \
- $(OUTDIR)ComboBoxView.$(O) \
- $(OUTDIR)ComboListView.$(O) \
- $(OUTDIR)ComboBoxButton.$(O) \
- $(OUTDIR)FilenameComboBoxView.$(O) \
- $(OUTDIR)MenuPanel.$(O) \
- $(OUTDIR)SelectionInTreeView.$(O) \
- $(OUTDIR)SelectionInTree.$(O) \
- $(OUTDIR)TreeItem.$(O) \
- $(OUTDIR)TreeItemWithImage.$(O) \
- $(OUTDIR)HierarchyNode.$(O) \
- $(OUTDIR)SelectionInHierarchy.$(O) \
- $(OUTDIR)NoteBookView.$(O) \
- $(OUTDIR)TabItem.$(O) \
- $(OUTDIR)TabView.$(O) \
- $(OUTDIR)TabWidget.$(O) \
- $(OUTDIR)DataSetView.$(O) \
- $(OUTDIR)DataSetColumn.$(O) \
- $(OUTDIR)DataSetLabel.$(O) \
- $(OUTDIR)DSVLabelView.$(O) \
- $(OUTDIR)DSVColumnView.$(O) \
- $(OUTDIR)GridBagConstraints.$(O) \
- $(OUTDIR)GridBagLayoutInfo.$(O) \
- $(OUTDIR)GridBagLayoutView.$(O) \
- $(OUTDIR)UpDownButton.$(O) \
- $(OUTDIR)ViewScroller.$(O) \
- $(OUTDIR)FileSelectionTree.$(O) \
- $(OUTDIR)FileSelectionItem.$(O) \
- $(OUTDIR)EnterBoxWithList.$(O) \
- $(OUTDIR)HierarchicalItem.$(O) \
- $(OUTDIR)ListModelView.$(O) \
- $(OUTDIR)SelectionInListModelView.$(O) \
- $(OUTDIR)HierarchicalListView.$(O) \
- $(OUTDIR)HierarchicalList.$(O) \
- $(OUTDIR)HierarchicalFileList.$(O) \
- $(OUTDIR)ExtendedComboBox.$(O) \
- $(OUTDIR)SyncedMultiColumnTextView.$(O) \
- $(OUTDIR)TwoColumnTextView.$(O) \
- $(OUTDIR)MultipleItemSelectionWidget.$(O) \
- $(OUTDIR)ProgressIndicator.$(O) \
- $(OUTDIR)ImageView.$(O)
-
-
#
# special BIG-rule (kludge for ibm/aix)
#
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Make.spec Fri Nov 21 20:52:47 2003 +0100
@@ -0,0 +1,68 @@
+# $Header: /cvs/stx/stx/libwidg2/Make.spec,v 1.1 2003-11-21 19:51:58 cg Exp $
+#
+# -------------- no need to change anything below ----------
+
+MODULE=stx
+MODULE_DIR=libwidg2
+LIBNAME=libwidg2
+PACKAGE=$(MODULE):$(LIBNAME)
+THIS_IS_A_BASE_LIBRARY="yes"
+
+OBJS= \
+ $(LIBWIDG2_PACKAGE_OBJS) \
+ $(OUTDIR)LicenceBox.$(O) \
+ $(OUTDIR)SubCanvas.$(O) \
+ $(OUTDIR)Slider.$(O) \
+ $(OUTDIR)HorizontalSlider.$(O) \
+ $(OUTDIR)LabelledEnterField.$(O) \
+ $(OUTDIR)FilenameEnterBox.$(O) \
+ $(OUTDIR)FilenameEditField.$(O) \
+ $(OUTDIR)CheckBox.$(O) \
+ $(OUTDIR)Separator.$(O) \
+ $(OUTDIR)TabulatorSpecification.$(O) \
+ $(OUTDIR)TabSpecRuler.$(O) \
+ $(OUTDIR)ListEntry.$(O) \
+ $(OUTDIR)MultiColListEntry.$(O) \
+ $(OUTDIR)ModelListEntry.$(O) \
+ $(OUTDIR)LabelAndIcon.$(O) \
+ $(OUTDIR)ComboView.$(O) \
+ $(OUTDIR)ComboBoxView.$(O) \
+ $(OUTDIR)ComboListView.$(O) \
+ $(OUTDIR)ComboBoxButton.$(O) \
+ $(OUTDIR)FilenameComboBoxView.$(O) \
+ $(OUTDIR)MenuPanel.$(O) \
+ $(OUTDIR)SelectionInTreeView.$(O) \
+ $(OUTDIR)SelectionInTree.$(O) \
+ $(OUTDIR)TreeItem.$(O) \
+ $(OUTDIR)TreeItemWithImage.$(O) \
+ $(OUTDIR)HierarchyNode.$(O) \
+ $(OUTDIR)SelectionInHierarchy.$(O) \
+ $(OUTDIR)NoteBookView.$(O) \
+ $(OUTDIR)TabItem.$(O) \
+ $(OUTDIR)TabView.$(O) \
+ $(OUTDIR)TabWidget.$(O) \
+ $(OUTDIR)DataSetView.$(O) \
+ $(OUTDIR)DataSetColumn.$(O) \
+ $(OUTDIR)DataSetLabel.$(O) \
+ $(OUTDIR)DSVLabelView.$(O) \
+ $(OUTDIR)DSVColumnView.$(O) \
+ $(OUTDIR)GridBagConstraints.$(O) \
+ $(OUTDIR)GridBagLayoutInfo.$(O) \
+ $(OUTDIR)GridBagLayoutView.$(O) \
+ $(OUTDIR)UpDownButton.$(O) \
+ $(OUTDIR)ViewScroller.$(O) \
+ $(OUTDIR)FileSelectionTree.$(O) \
+ $(OUTDIR)FileSelectionItem.$(O) \
+ $(OUTDIR)EnterBoxWithList.$(O) \
+ $(OUTDIR)HierarchicalItem.$(O) \
+ $(OUTDIR)ListModelView.$(O) \
+ $(OUTDIR)SelectionInListModelView.$(O) \
+ $(OUTDIR)HierarchicalListView.$(O) \
+ $(OUTDIR)HierarchicalList.$(O) \
+ $(OUTDIR)HierarchicalFileList.$(O) \
+ $(OUTDIR)ExtendedComboBox.$(O) \
+ $(OUTDIR)SyncedMultiColumnTextView.$(O) \
+ $(OUTDIR)TwoColumnTextView.$(O) \
+ $(OUTDIR)MultipleItemSelectionWidget.$(O) \
+ $(OUTDIR)ProgressIndicator.$(O) \
+ $(OUTDIR)ImageView.$(O)
--- a/bc.mak Fri Nov 21 16:39:44 2003 +0100
+++ b/bc.mak Fri Nov 21 20:52:47 2003 +0100
@@ -2,16 +2,16 @@
# DO NOT EDIT
# automatically generated from Make.proto (by make nt.mak)
#
-# $Header: /cvs/stx/stx/libwidg2/bc.mak,v 1.39 2003-11-21 15:04:41 cg Exp $
+# $Header: /cvs/stx/stx/libwidg2/bc.mak,v 1.40 2003-11-21 19:52:47 cg Exp $
#
TOP=..
+
#
!INCLUDE $(TOP)\rules\stdHeader_nt
#
-MODULE=stx
-MODULE_DIR=libwidg2
-PACKAGE=$(MODULE):$(MODULE_DIR)
-LIBNAME=libwidg2
+!INCLUDE Make.spec
+#
+
LIB_BASE_LD_ARG=$(LIBWIDG2_BASE_LD_ARG)
STCOPT=" -warnNonStandard"
STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
@@ -20,68 +20,8 @@
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
-OBJS=\
- $(OUTDIR)LicenceBox.$(O) \
- $(OUTDIR)SubCanvas.$(O) \
- $(OUTDIR)Slider.$(O) \
- $(OUTDIR)HorizontalSlider.$(O) \
- $(OUTDIR)LabelledEnterField.$(O) \
- $(OUTDIR)FilenameEnterBox.$(O) \
- $(OUTDIR)FilenameEditField.$(O) \
- $(OUTDIR)CheckBox.$(O) \
- $(OUTDIR)Separator.$(O) \
- $(OUTDIR)TabulatorSpecification.$(O) \
- $(OUTDIR)TabSpecRuler.$(O) \
- $(OUTDIR)ListEntry.$(O) \
- $(OUTDIR)MultiColListEntry.$(O) \
- $(OUTDIR)ModelListEntry.$(O) \
- $(OUTDIR)LabelAndIcon.$(O) \
- $(OUTDIR)ComboView.$(O) \
- $(OUTDIR)ComboBoxView.$(O) \
- $(OUTDIR)ComboListView.$(O) \
- $(OUTDIR)ComboBoxButton.$(O) \
- $(OUTDIR)MenuPanel.$(O) \
- $(OUTDIR)SelectionInTreeView.$(O) \
- $(OUTDIR)SelectionInTree.$(O) \
- $(OUTDIR)TreeItem.$(O) \
- $(OUTDIR)TreeItemWithImage.$(O) \
- $(OUTDIR)HierarchyNode.$(O) \
- $(OUTDIR)SelectionInHierarchy.$(O) \
- $(OUTDIR)NoteBookView.$(O) \
- $(OUTDIR)TabView.$(O) \
- $(OUTDIR)TabWidget.$(O) \
- $(OUTDIR)DataSetView.$(O) \
- $(OUTDIR)DataSetColumn.$(O) \
- $(OUTDIR)DataSetLabel.$(O) \
- $(OUTDIR)DSVLabelView.$(O) \
- $(OUTDIR)DSVColumnView.$(O) \
- $(OUTDIR)GridBagConstraints.$(O) \
- $(OUTDIR)GridBagLayoutInfo.$(O) \
- $(OUTDIR)GridBagLayoutView.$(O) \
- $(OUTDIR)UpDownButton.$(O) \
- $(OUTDIR)ViewScroller.$(O) \
- $(OUTDIR)FileSelectionTree.$(O) \
- $(OUTDIR)FileSelectionItem.$(O) \
- $(OUTDIR)EnterBoxWithList.$(O) \
- $(OUTDIR)HierarchicalItem.$(O) \
- $(OUTDIR)ListModelView.$(O) \
- $(OUTDIR)SelectionInListModelView.$(O) \
- $(OUTDIR)HierarchicalListView.$(O) \
- $(OUTDIR)HierarchicalList.$(O) \
- $(OUTDIR)ExtendedComboBox.$(O) \
- $(OUTDIR)MultipleItemSelectionWidget.$(O) \
- $(OUTDIR)HierarchicalFileList.$(O) \
- $(OUTDIR)FilenameComboBoxView.$(O) \
- $(OUTDIR)SyncedMultiColumnTextView.$(O) \
- $(OUTDIR)TwoColumnTextView.$(O) \
- $(OUTDIR)TabItem.$(O) \
- $(OUTDIR)ProgressIndicator.$(O) \
- $(OUTDIR)ImageView.$(O) \
-
-
!INCLUDE $(TOP)\rules\stdRules_nt
-
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)CheckBox.$(O) CheckBox.$(H): CheckBox.st $(STCHDR) ../include/HorizontalPanelView.$(H) ../include/PanelView.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
$(OUTDIR)ColoredListEntry.$(O) ColoredListEntry.$(H): ColoredListEntry.st $(STCHDR) ../include/ListEntry.$(H) ../include/Object.$(H)
--- a/nt.mak Fri Nov 21 16:39:44 2003 +0100
+++ b/nt.mak Fri Nov 21 20:52:47 2003 +0100
@@ -2,16 +2,16 @@
# DO NOT EDIT
# automatically generated from Make.proto (by make nt.mak)
#
-# $Header: /cvs/stx/stx/libwidg2/Attic/nt.mak,v 1.39 2003-11-21 15:04:41 cg Exp $
+# $Header: /cvs/stx/stx/libwidg2/Attic/nt.mak,v 1.40 2003-11-21 19:52:47 cg Exp $
#
TOP=..
+
#
!INCLUDE $(TOP)\rules\stdHeader_nt
#
-MODULE=stx
-MODULE_DIR=libwidg2
-PACKAGE=$(MODULE):$(MODULE_DIR)
-LIBNAME=libwidg2
+!INCLUDE Make.spec
+#
+
LIB_BASE_LD_ARG=$(LIBWIDG2_BASE_LD_ARG)
STCOPT=" -warnNonStandard"
STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
@@ -20,68 +20,8 @@
ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
-OBJS=\
- $(OUTDIR)LicenceBox.$(O) \
- $(OUTDIR)SubCanvas.$(O) \
- $(OUTDIR)Slider.$(O) \
- $(OUTDIR)HorizontalSlider.$(O) \
- $(OUTDIR)LabelledEnterField.$(O) \
- $(OUTDIR)FilenameEnterBox.$(O) \
- $(OUTDIR)FilenameEditField.$(O) \
- $(OUTDIR)CheckBox.$(O) \
- $(OUTDIR)Separator.$(O) \
- $(OUTDIR)TabulatorSpecification.$(O) \
- $(OUTDIR)TabSpecRuler.$(O) \
- $(OUTDIR)ListEntry.$(O) \
- $(OUTDIR)MultiColListEntry.$(O) \
- $(OUTDIR)ModelListEntry.$(O) \
- $(OUTDIR)LabelAndIcon.$(O) \
- $(OUTDIR)ComboView.$(O) \
- $(OUTDIR)ComboBoxView.$(O) \
- $(OUTDIR)ComboListView.$(O) \
- $(OUTDIR)ComboBoxButton.$(O) \
- $(OUTDIR)MenuPanel.$(O) \
- $(OUTDIR)SelectionInTreeView.$(O) \
- $(OUTDIR)SelectionInTree.$(O) \
- $(OUTDIR)TreeItem.$(O) \
- $(OUTDIR)TreeItemWithImage.$(O) \
- $(OUTDIR)HierarchyNode.$(O) \
- $(OUTDIR)SelectionInHierarchy.$(O) \
- $(OUTDIR)NoteBookView.$(O) \
- $(OUTDIR)TabView.$(O) \
- $(OUTDIR)TabWidget.$(O) \
- $(OUTDIR)DataSetView.$(O) \
- $(OUTDIR)DataSetColumn.$(O) \
- $(OUTDIR)DataSetLabel.$(O) \
- $(OUTDIR)DSVLabelView.$(O) \
- $(OUTDIR)DSVColumnView.$(O) \
- $(OUTDIR)GridBagConstraints.$(O) \
- $(OUTDIR)GridBagLayoutInfo.$(O) \
- $(OUTDIR)GridBagLayoutView.$(O) \
- $(OUTDIR)UpDownButton.$(O) \
- $(OUTDIR)ViewScroller.$(O) \
- $(OUTDIR)FileSelectionTree.$(O) \
- $(OUTDIR)FileSelectionItem.$(O) \
- $(OUTDIR)EnterBoxWithList.$(O) \
- $(OUTDIR)HierarchicalItem.$(O) \
- $(OUTDIR)ListModelView.$(O) \
- $(OUTDIR)SelectionInListModelView.$(O) \
- $(OUTDIR)HierarchicalListView.$(O) \
- $(OUTDIR)HierarchicalList.$(O) \
- $(OUTDIR)ExtendedComboBox.$(O) \
- $(OUTDIR)MultipleItemSelectionWidget.$(O) \
- $(OUTDIR)HierarchicalFileList.$(O) \
- $(OUTDIR)FilenameComboBoxView.$(O) \
- $(OUTDIR)SyncedMultiColumnTextView.$(O) \
- $(OUTDIR)TwoColumnTextView.$(O) \
- $(OUTDIR)TabItem.$(O) \
- $(OUTDIR)ProgressIndicator.$(O) \
- $(OUTDIR)ImageView.$(O) \
-
-
!INCLUDE $(TOP)\rules\stdRules_nt
-
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)CheckBox.$(O) CheckBox.$(H): CheckBox.st $(STCHDR) ../include/HorizontalPanelView.$(H) ../include/PanelView.$(H) ../include/SimpleView.$(H) ../include/DisplaySurface.$(H) ../include/GraphicsMedium.$(H) ../include/DeviceGraphicsContext.$(H) ../include/GraphicsContext.$(H) ../include/Object.$(H)
$(OUTDIR)ColoredListEntry.$(O) ColoredListEntry.$(H): ColoredListEntry.st $(STCHDR) ../include/ListEntry.$(H) ../include/Object.$(H)