--- a/Make.proto Wed Dec 18 15:06:23 1996 +0100
+++ b/Make.proto Tue Jan 07 13:26:54 1997 +0100
@@ -141,7 +141,7 @@
#
demoApp1:
-rm main.o modulList.*
- $(MAKE) main.o MAIN=$(LIBRUNDIR)/appmain.c STARTUP_CLASS='"FileBrowser"' STARTUP_SELECTOR='"open"'
+ $(MAKE) main.o STARTUP_CLASS='"FileBrowser"' STARTUP_SELECTOR='"open"'
$(MAKE) linkTarget TARGET=demoApp1
-rm main.o modulList.*
@@ -150,13 +150,13 @@
#
demoApp2: DemoApp2.o
-rm main.o modulList.*
- $(MAKE) main.o MAIN=$(LIBRUNDIR)/appmain.c STARTUP_CLASS='"DemoApp2"' STARTUP_SELECTOR='"start"'
+ $(MAKE) main.o STARTUP_CLASS='"DemoApp2"' STARTUP_SELECTOR='"start"'
$(MAKE) linkTarget \
LIBLIST="$(MINI_LIST)" \
LIBOBJS="$(MINI_LIB)" \
TARGET=demoApp2 \
- EXTRA_OBJ="DemoApp2.o" \
- EXTRA_CLASSES="DemoApp2"
+ ADDITIONAL_OBJS="DemoApp2.o" \
+ ADDITIONAL_CLASSES="DemoApp2"
-rm main.o modulList.* DemoApp2.st DemoApp2.o
DemoApp2.o:: DemoApp2.st
@@ -177,7 +177,7 @@
LINK_LIBOBJS="$(STATIC_LIBOBJS)" \
LINK_LIBRUN="$(STATIC_LIBRUN)" \
LIBRUN="$(STATIC_LIBRUN)" \
- ADDITIONAL_OBJECTS=$(STATIC_ADDITIONAL_OBJECTS) \
+ ADDITIONAL_OBJS=$(STATIC_ADDITIONAL_OBJS) \
ADDITIONAL_CLASSES=$(STATIC_ADDITIONAL_CLASSES) \
EXTRA_OBJ="$(STATIC_EXTRA_OBJ)" \
EXTRA_LINK_OBJ="$(STATIC_EXTRA_OBJ)" \
@@ -188,7 +188,7 @@
@echo "making shared library linked smalltalk ..."
@$(MAKE) linkIt \
LIBOBJS="$(LIBOBJS)" \
- ADDITIONAL_OBJECTS=$(ADDITIONAL_OBJECTS) \
+ ADDITIONAL_OBJS=$(ADDITIONAL_OBJS) \
ADDITIONAL_CLASSES=$(ADDITIONAL_CLASSES) \
EXTRA_OBJ="$(EXTRA_OBJ)" \
EXTRA_LINK_OBJ="$(EXTRA_LINK_OBJ)" \
@@ -202,7 +202,7 @@
LINK_LIBOBJS="$(STATIC_LIBOBJS)" \
LINK_LIBRUN="$(STATIC_LIBRUN)" \
LIBRUN="$(STATIC_LIBRUN)" \
- ADDITIONAL_OBJECTS=$(STATIC_ADDITIONAL_OBJECTS) \
+ ADDITIONAL_OBJS=$(STATIC_ADDITIONAL_OBJS) \
ADDITIONAL_CLASSES=$(STATIC_ADDITIONAL_CLASSES) \
EXTRA_OBJ="$(STATIC_EXTRA_OBJ)" \
EXTRA_LINK_OBJ="$(STATIC_EXTRA_OBJ)" \