--- a/Make.proto Tue Jan 07 18:35:25 1997 +0100
+++ b/Make.proto Tue Jan 07 22:41:36 1997 +0100
@@ -62,41 +62,37 @@
#
# directories from which bitmap files in bitmap subdirectories are to be symlinked
# to the bitmaps subdirectory
+# The default lists all relevant dirs.
#
-BITMAPDIRS= \
- $(LIBBASIC2DIR) $(LIBHTMLDIR) $(LIBVIEWDIR) $(LIBVIEW2DIR) $(LIBWIDGDIR) $(LIBWIDG2DIR) \
- $(LIBWIDG3DIR) $(LIBTABLEDIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]* \
- $(OTHERLIBDIRS) \
- $(TOP)/fileIn $(TOP)/fileIn/* $(TOP)/goodies \
- $(TOP)/goodies/* $(TOP)/goodies/*/* \
- $(EXTRA_BITMAPDIRS)
+# BITMAPLINK_DIRS= ...
+
+#
+# you may add additional bitmap dirs here
+#
+# EXTRA_BITMAPLINK_DIRS= ...
-MOREBITMAPDIRS= \
- $(TOP)/goodies/bitmaps/*
+#
+# directories from which resource files are to be symlinked
+# to the resources subdirectory
+# The default lists all relevant dirs.
+#
+# RESOURCELINK_DIRS= ...
#
# directories from which binary files are to be symlinked
# to the binary subdirectory
+# The default lists all relevant dirs.
#
-BINARYDIRS= \
- $(LIBBASICDIR) $(LIBBASIC2DIR) $(LIBBASIC3DIR) $(LIBHTMLDIR) $(LIBVIEWDIR) $(LIBVIEW2DIR) $(LIBWIDGDIR) \
- $(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]* \
- $(LIBCOMPDIR) $(LIBTABLEDIR) $(LIBCOMPATDIR) $(LIBPRODIR) $(OTHERLIBDIRS) \
- $(TOP)/fileIn $(TOP)/libtomcat $(TOP)/goodies $(TOP)/goodies/* \
- $(TOP)/goodies/*/* \
- $(EXTRA_BINARYDIRS)
+# BINARYLINK_DIRS= ...
+# EXTRA_BINARYLINK_DIRS= ...
#
# directories from which source files are to be symlinked
# to the source subdirectory
+# The default lists all relevant dirs.
#
-SOURCEDIRS= \
- $(LIBBASICDIR) $(LIBBASIC2DIR) $(LIBBASIC3DIR) $(LIBHTMLDIR) $(LIBCOMPDIR) $(LIBVIEWDIR) $(LIBVIEW2DIR) \
- $(LIBWIDGDIR) $(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]* \
- $(LIBTABLEDIR) $(LIBUIDIR) $(LIBCOMPATDIR) $(LIBPRODIR) $(OTHERLIBDIRS) \
- $(TOP)/fileIn $(TOP)/libtomcat $(TOP)/goodies $(TOP)/goodies/* \
- $(TOP)/goodies/*/* $(TOP)/contrib/* $(TOP)/doc/coding \
- $(EXTRA_SOURCEDIRS)
+# SOURCELINK_DIRS= ...
+# EXTRA_SOURCELINK_DIRS= ...
#
# including your own private lib in the make process and executable:
@@ -126,7 +122,7 @@
# create symbolic links to sources, resources etc.
# normally (on an end-user system) these should go into usr/local/lib/smalltalk
#
-symlinks: resources styles newSource bitmaps bitmapLink binary binaryLink includeLink misc
+symlinks: resources styleLink newSource bitmapLink binaryLink includeLink misc
#
# the standard smalltalk executable:
@@ -141,7 +137,10 @@
#
fbrowser:
-rm main.o modulList.*
- $(MAKE) main.o STARTUP_CLASS='"FileBrowser"' STARTUP_SELECTOR='"open"' MAIN_DEFINES="-DIGNORE_IMAGE"
+ $(MAKE) main.o \
+ STARTUP_CLASS="FileBrowser" \
+ STARTUP_SELECTOR="open" \
+ MAIN_DEFINES="-DIGNORE_IMAGE"
$(MAKE) linkTarget TARGET=fbrowser
-rm main.o modulList.*
@@ -154,8 +153,8 @@
TARGET=demoApp1 \
APPLICATION_CLASSES="DemoApp1" \
APPLICATION_OBJS="DemoApp1.o" \
- STARTUP_CLASS='\"DemoApp1\"' \
- STARTUP_SELECTOR='\"start\"' \
+ STARTUP_CLASS="DemoApp1" \
+ STARTUP_SELECTOR="start" \
MAIN_DEFINES="-DIGNORE_IMAGE"
DemoApp1.o:: DemoApp1.st
@@ -352,40 +351,40 @@
includelink:: includeLink
-includeLink:
- @-rm -f ttt*.H
- @-if [ ! -d include ]; then \
- mkdir include; \
- fi
- @-if [ ! -r include/abbrev.stc ]; then \
- if [ -f $(INCLUDE)/abbrev.stc ]; then \
- echo "linking abbrev.stc ..."; \
- (cd include; $(LNS) ../$(INCLUDE)/abbrev.stc .); \
- else \
- echo "oops - no $(INCLUDE)/abbrev.stc"; \
- fi \
- fi
- @-if [ ! -r include/liblist.stc ]; then \
- if [ -f $(INCLUDE)/liblist.stc ]; then \
- echo "linking liblist.stc ..."; \
- (cd include; $(LNS) ../$(INCLUDE)/liblist.stc .); \
- else \
- echo "oops - no $(INCLUDE)/liblist.stc"; \
- fi \
- fi
- @-if [ ! -r include/symbols.stc ]; then \
- if [ -f $(INCLUDE)/symbols.stc ]; then \
- echo "linking symbols.stc ..."; \
- (cd include; $(LNS) ../$(INCLUDE)/symbols.stc .); \
- fi \
- fi
- @-if [ ! -r include/autoloadList.stc ]; then \
- if [ -f $(INCLUDE)/autoloadList.stc ]; then \
- echo "linking autoloadList.stc ..."; \
- (cd include; $(LNS) ../$(INCLUDE)/autoloadList.stc .); \
- fi \
- fi
- @-rm -f include/RCS include/CVS
+#includeLink:
+# @-rm -f ttt*.H
+# @-if [ ! -d include ]; then \
+# mkdir include; \
+# fi
+# @-if [ ! -r include/abbrev.stc ]; then \
+# if [ -f $(INCLUDE)/abbrev.stc ]; then \
+# echo "linking abbrev.stc ..."; \
+# (cd include; $(LNS) ../$(INCLUDE)/abbrev.stc .); \
+# else \
+# echo "oops - no $(INCLUDE)/abbrev.stc"; \
+# fi \
+# fi
+# @-if [ ! -r include/liblist.stc ]; then \
+# if [ -f $(INCLUDE)/liblist.stc ]; then \
+# echo "linking liblist.stc ..."; \
+# (cd include; $(LNS) ../$(INCLUDE)/liblist.stc .); \
+# else \
+# echo "oops - no $(INCLUDE)/liblist.stc"; \
+# fi \
+# fi
+# @-if [ ! -r include/symbols.stc ]; then \
+# if [ -f $(INCLUDE)/symbols.stc ]; then \
+# echo "linking symbols.stc ..."; \
+# (cd include; $(LNS) ../$(INCLUDE)/symbols.stc .); \
+# fi \
+# fi
+# @-if [ ! -r include/autoloadList.stc ]; then \
+# if [ -f $(INCLUDE)/autoloadList.stc ]; then \
+# echo "linking autoloadList.stc ..."; \
+# (cd include; $(LNS) ../$(INCLUDE)/autoloadList.stc .); \
+# fi \
+# fi
+# @-rm -f include/RCS include/CVS
misc: examples
@@ -470,7 +469,7 @@
#
newResources:
rm -rf resources
- @$(MAKE) resources styles
+ @$(MAKE) resources styleLink
resources:
-mkdir resources
@@ -478,63 +477,64 @@
resourcelink: resourceLink
-resourceLink:
- @-if [ "`echo $(LIBBASICDIR)/resources/*`" != '$(LIBBASICDIR)/resources/*' ]; then \
- echo "linking resource files from $(LIBBASICDIR) ..."; \
- (cd resources; $(LNS) ../$(LIBBASICDIR)/resources/* .); \
- rm -f resources/RCS resources/CVS; \
- fi
- @-if [ "`echo $(LIBVIEWDIR)/resources/*`" != '$(LIBVIEWDIR)/resources/*' ]; then \
- echo "linking resource files from $(LIBVIEWDIR) ..."; \
- (cd resources; $(LNS) ../$(LIBVIEWDIR)/resources/* .); \
- rm -f resources/RCS resources/CVS; \
- fi
- @-if [ "`echo $(LIBVIEW2DIR)/resources/*`" != '$(LIBVIEW2DIR)/resources/*' ]; then \
- echo "linking resource files from $(LIBVIEW2DIR) ..."; \
- (cd resources; $(LNS) ../$(LIBVIEW2DIR)/resources/* .); \
- rm -f resources/RCS resources/CVS; \
- fi
- @-if [ "`echo $(LIBWIDGDIR)/resources/*`" != '$(LIBWIDGDIR)/resources/*' ]; then \
- echo "linking resource files from $(LIBWIDGDIR) ..."; \
- (cd resources; $(LNS) ../$(LIBWIDGDIR)/resources/* .); \
- rm -f resources/RCS resources/CVS; \
- fi
- @-if [ "`echo $(LIBWIDG2DIR)/resources/*`" != '$(LIBWIDG2DIR)/resources/*' ]; then \
- echo "linking resource files from $(LIBWIDG2DIR) ..."; \
- (cd resources; $(LNS) ../$(LIBWIDG2DIR)/resources/* .); \
- rm -f resources/RCS resources/CVS; \
- fi
- @-if [ "`echo $(LIBWIDG3DIR)/resources/*`" != '$(LIBWIDG3DIR)/resources/*' ]; then \
- echo "linking resource files from $(LIBWIDG3DIR) ..."; \
- (cd resources; $(LNS) ../$(LIBWIDG3DIR)/resources/* .); \
- rm -f resources/RCS resources/CVS; \
- fi
- @-if [ "`echo $(LIBTOOLDIR)/resources/*`" != '$(LIBTOOLDIR)/resources/*' ]; then \
- echo "linking resource files from $(LIBTOOLDIR) ..."; \
- (cd resources; $(LNS) ../$(LIBTOOLDIR)/resources/* .); \
- rm -f resources/RCS resources/CVS; \
- fi
- @-if [ "`echo $(LIBTABLEDIR)/resources/*`" != '$(LIBTABLEDIR)/resources/*' ]; then \
- echo "linking resource files from $(LIBTABLEDIR) ..."; \
- (cd resources; $(LNS) ../$(LIBTABLEDIR)/resources/* .); \
- rm -f resources/RCS resources/CVS; \
- fi
- @-if [ "`echo $(TOP)/fileIn/resources/*`" != '$(TOP)/fileIn/resources/*' ]; then \
- echo "linking resource files from $(TOP)/fileIn ..."; \
- (cd resources; $(LNS) ../$(TOP)/fileIn/resources/* .); \
- rm -f resources/RCS resources/CVS; \
- fi
- @-if [ "`echo $(CLIENTDIR)/*/resources/*`" != '$(CLIENTDIR)/*/resources/*' ]; then \
- echo "linking resource files from $(CLIENTDIR) ..."; \
- (cd resources; $(LNS) ../$(CLIENTDIR)/*/resources/* .); \
- rm -f resources/RCS resources/CVS; \
- fi
+#resourceLink:
+# @-if [ "`echo $(LIBBASICDIR)/resources/*`" != '$(LIBBASICDIR)/resources/*' ]; then \
+# echo "linking resource files from $(LIBBASICDIR) ..."; \
+# (cd resources; $(LNS) ../$(LIBBASICDIR)/resources/* .); \
+# rm -f resources/RCS resources/CVS; \
+# fi
+# @-if [ "`echo $(LIBVIEWDIR)/resources/*`" != '$(LIBVIEWDIR)/resources/*' ]; then \
+# echo "linking resource files from $(LIBVIEWDIR) ..."; \
+# (cd resources; $(LNS) ../$(LIBVIEWDIR)/resources/* .); \
+# rm -f resources/RCS resources/CVS; \
+# fi
+# @-if [ "`echo $(LIBVIEW2DIR)/resources/*`" != '$(LIBVIEW2DIR)/resources/*' ]; then \
+# echo "linking resource files from $(LIBVIEW2DIR) ..."; \
+# (cd resources; $(LNS) ../$(LIBVIEW2DIR)/resources/* .); \
+# rm -f resources/RCS resources/CVS; \
+# fi
+# @-if [ "`echo $(LIBWIDGDIR)/resources/*`" != '$(LIBWIDGDIR)/resources/*' ]; then \
+# echo "linking resource files from $(LIBWIDGDIR) ..."; \
+# (cd resources; $(LNS) ../$(LIBWIDGDIR)/resources/* .); \
+# rm -f resources/RCS resources/CVS; \
+# fi
+# @-if [ "`echo $(LIBWIDG2DIR)/resources/*`" != '$(LIBWIDG2DIR)/resources/*' ]; then \
+# echo "linking resource files from $(LIBWIDG2DIR) ..."; \
+# (cd resources; $(LNS) ../$(LIBWIDG2DIR)/resources/* .); \
+# rm -f resources/RCS resources/CVS; \
+# fi
+# @-if [ "`echo $(LIBWIDG3DIR)/resources/*`" != '$(LIBWIDG3DIR)/resources/*' ]; then \
+# echo "linking resource files from $(LIBWIDG3DIR) ..."; \
+# (cd resources; $(LNS) ../$(LIBWIDG3DIR)/resources/* .); \
+# rm -f resources/RCS resources/CVS; \
+# fi
+# @-if [ "`echo $(LIBTOOLDIR)/resources/*`" != '$(LIBTOOLDIR)/resources/*' ]; then \
+# echo "linking resource files from $(LIBTOOLDIR) ..."; \
+# (cd resources; $(LNS) ../$(LIBTOOLDIR)/resources/* .); \
+# rm -f resources/RCS resources/CVS; \
+# fi
+# @-if [ "`echo $(LIBTABLEDIR)/resources/*`" != '$(LIBTABLEDIR)/resources/*' ]; then \
+# echo "linking resource files from $(LIBTABLEDIR) ..."; \
+# (cd resources; $(LNS) ../$(LIBTABLEDIR)/resources/* .); \
+# rm -f resources/RCS resources/CVS; \
+# fi
+# @-if [ "`echo $(TOP)/fileIn/resources/*`" != '$(TOP)/fileIn/resources/*' ]; then \
+# echo "linking resource files from $(TOP)/fileIn ..."; \
+# (cd resources; $(LNS) ../$(TOP)/fileIn/resources/* .); \
+# rm -f resources/RCS resources/CVS; \
+# fi
+# @-if [ "`echo $(CLIENTDIR)/*/resources/*`" != '$(CLIENTDIR)/*/resources/*' ]; then \
+# echo "linking resource files from $(CLIENTDIR) ..."; \
+# (cd resources; $(LNS) ../$(CLIENTDIR)/*/resources/* .); \
+# rm -f resources/RCS resources/CVS; \
+# fi
-styles: resources
- @-echo "linking style files from $(LIBVIEWDIR)/styles ..."
- @-rm -f resources/*.style resources/*.common
- @-(cd resources; $(LNS) ../$(LIBVIEWDIR)/styles/* .)
- @rm -f resources/RCS resources/CVS
+styles: styleLink
+#styles: resources
+# @-echo "linking style files from $(LIBVIEWDIR)/styles ..."
+# @-rm -f resources/*.style resources/*.common
+# @-(cd resources; $(LNS) ../$(LIBVIEWDIR)/styles/* .)
+# @rm -f resources/RCS resources/CVS
main.o:: $(INCLUDE)/stc.h $(INCLUDE)/stcIntern.h Makefile