85 # EXTENDED_LIB = above PLUS libwidg3 |
85 # EXTENDED_LIB = above PLUS libwidg3 |
86 |
86 |
87 CLASSLIBDIRS = $(STANDARD_DIR) $(PRIVATE_CLASSLIBDIRS) $(ARCH_CLASSLIBDIRS) |
87 CLASSLIBDIRS = $(STANDARD_DIR) $(PRIVATE_CLASSLIBDIRS) $(ARCH_CLASSLIBDIRS) |
88 LIBOBJS = $(STANDARD_LIB) $(PRIVATE_OBJS) |
88 LIBOBJS = $(STANDARD_LIB) $(PRIVATE_OBJS) |
89 LINK_LIBOBJS = $(LINK_STANDARD_LIB) $(PRIVATE_OBJS) |
89 LINK_LIBOBJS = $(LINK_STANDARD_LIB) $(PRIVATE_OBJS) |
90 STATIC_LIBOBJS = $(STATIC_STANDARD_LIB) $(PRIVATE_OBJS) |
90 STATIC_LIBOBJS = $(STATIC_STANDARD_LIB) $(PRIVATE_OBJS) $(STATIC_LIBOBJC) |
91 LIBLIST = $(STANDARD_LIST) $(PRIVATE_LIBS) |
91 LIBLIST = $(STANDARD_LIST) $(PRIVATE_LIBS) libstx_libobjc |
92 |
92 |
93 # WORKSTAT1 = XWorkstation |
93 # WORKSTAT1 = XWorkstation |
94 # WORKSTAT2 = GLXWorkstation |
94 # WORKSTAT2 = GLXWorkstation |
95 EXTRA_UI_CLASSES= $(WORKSTAT1) $(WORKSTAT2) |
95 EXTRA_UI_CLASSES= $(WORKSTAT1) $(WORKSTAT2) |
96 |
96 |
107 $(OPTIONAL_LINK_GLXWORKSTATION_OBJ) |
107 $(OPTIONAL_LINK_GLXWORKSTATION_OBJ) |
108 |
108 |
109 OPTIONAL_LIBGL_TARGET = $(LIB_GL_TARGET) |
109 OPTIONAL_LIBGL_TARGET = $(LIB_GL_TARGET) |
110 OPTIONAL_GL_LIB = $(LIB_GL) |
110 OPTIONAL_GL_LIB = $(LIB_GL) |
111 OPTIONAL_LINK_GL_LIB = $(LINK_LIB_GL) |
111 OPTIONAL_LINK_GL_LIB = $(LINK_LIB_GL) |
|
112 |
|
113 STATIC_ADDITIONAL_OBJS=/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation |
112 |
114 |
113 # ---------------------- end additional stuff -------------------- |
115 # ---------------------- end additional stuff -------------------- |
114 |
116 |
115 |
117 |
116 # |
118 # |
185 $(TARGET)_static: $(STATIC_LIBRUN) |
187 $(TARGET)_static: $(STATIC_LIBRUN) |
186 @echo "making statically linked smalltalk ..." |
188 @echo "making statically linked smalltalk ..." |
187 @$(MAKE) linkTarget \ |
189 @$(MAKE) linkTarget \ |
188 LIBOBJS="" \ |
190 LIBOBJS="" \ |
189 LINK_OBJS="$(STATIC_OBJS) $(STATIC_EXTRA_UI_OBJ)" \ |
191 LINK_OBJS="$(STATIC_OBJS) $(STATIC_EXTRA_UI_OBJ)" \ |
190 LINK_LIBOBJS="$(STATIC_LIBOBJS)" \ |
192 LINK_LIBOBJS="$(STATIC_LIBOBJS) $(STATIC_EXTRA_UI_OBJ)" \ |
191 LINK_LIBRUN="$(STATIC_LIBRUN)" \ |
193 LINK_LIBRUN="$(STATIC_LIBRUN)" \ |
192 LIBRUN="$(STATIC_LIBRUN)" \ |
194 LIBRUN="$(STATIC_LIBRUN)" \ |
193 ADDITIONAL_OBJS=$(STATIC_ADDITIONAL_OBJS) \ |
195 ADDITIONAL_OBJS=$(STATIC_ADDITIONAL_OBJS) \ |
194 ADDITIONAL_CLASSES=$(STATIC_ADDITIONAL_CLASSES) \ |
196 ADDITIONAL_CLASSES=$(STATIC_ADDITIONAL_CLASSES) \ |
|
197 EXTRA_LIBS="$(STATIC_EXTRA_LIBS)" \ |
195 LIBLIST="$(LIBLIST) $(EXTRA_UI_CLASSES)" |
198 LIBLIST="$(LIBLIST) $(EXTRA_UI_CLASSES)" |
196 @$(MAKE) removeLinkLibs |
199 @$(MAKE) removeLinkLibs |
197 |
200 |
198 $(TARGET)_fullstatic: $(STATIC_LIBRUN) |
201 $(TARGET)_fullstatic: $(STATIC_LIBRUN) |
199 if [ -f $(LIBRUNDIR)/librun.a ]; then \ |
202 if [ -f $(LIBRUNDIR)/librun.a ]; then \ |
203 fi |
206 fi |
204 @echo "making full statically linked smalltalk ..." |
207 @echo "making full statically linked smalltalk ..." |
205 @$(MAKE) linkTarget \ |
208 @$(MAKE) linkTarget \ |
206 LIBOBJS="" \ |
209 LIBOBJS="" \ |
207 LINK_OBJS="$(STATIC_OBJS) $(STATIC_EXTRA_UI_OBJ)" \ |
210 LINK_OBJS="$(STATIC_OBJS) $(STATIC_EXTRA_UI_OBJ)" \ |
208 LINK_LIBOBJS="$(STATIC_LIBOBJS)" \ |
211 LINK_LIBOBJS="$(STATIC_LIBOBJS) $(STATIC_EXTRA_UI_OBJ)" \ |
209 LINK_LIBRUN="$(STATIC_LIBRUN)" \ |
212 LINK_LIBRUN="$(STATIC_LIBRUN)" \ |
210 LIBRUN="$(STATIC_LIBRUN)" \ |
213 LIBRUN="$(STATIC_LIBRUN)" \ |
211 ADDITIONAL_OBJS=$(STATIC_ADDITIONAL_OBJS) \ |
214 ADDITIONAL_OBJS=$(STATIC_ADDITIONAL_OBJS) \ |
212 ADDITIONAL_CLASSES=$(STATIC_ADDITIONAL_CLASSES) \ |
215 ADDITIONAL_CLASSES=$(STATIC_ADDITIONAL_CLASSES) \ |
213 LIBLIST="$(LIBLIST) $(EXTRA_UI_CLASSES)" \ |
216 LIBLIST="$(LIBLIST) $(EXTRA_UI_CLASSES)" \ |