Fixed impossibility of building GED+ under OS/2

This commit is contained in:
Alexander S. Aganichev 2000-04-25 15:21:01 +00:00
parent 9ab4805a4f
commit 5d796969ed

View File

@ -15,14 +15,13 @@ FDEPPATH=$(TOP)/$(DEPPATH)/$(PLATFORM)
bld$(PLATFORM).inc: $(TARGET).all bld$(PLATFORM).inc: $(TARGET).all
@echo making sourcelist @echo making sourcelist
@grep -w $(PLATFORM) $< \ @grep -w $(PLATFORM) $< \
| sed 's/^\([[:alnum:]_]*\)[ ]*\([[:alnum:]_]*\).*/SOURCES+=\1.\2/g' > $@ | sed 's;^\([[:alnum:]_]*\)[ ]*\([[:alnum:]_]*\).*;SOURCES+=\1.\2;' > $@
ifeq ($(FDEPPATH)/dep,$(wildcard $(FDEPPATH)/de?)) ifeq ($(FDEPPATH)/dep,$(wildcard $(FDEPPATH)/de?))
$(FDEPPATH)/$(TARGET)/%.d: %.cpp $(FDEPPATH)/$(TARGET)/%.d: %.cpp
@echo making depends for $< @echo making depends for $<
@$(SHELL) -ec '$(CXX) -c -M $(CPPFLAGS) $< \ @$(SHELL) -ec '$(CXX) -c -M $(CPPFLAGS) $< \
| sed '\''s;\($*\)\$(OBJEXT)[ :]*;$(subst /,\/,$(FOBJPATH))\/\1\$(OBJEXT) $(subst /,\/,$@): ;g'\'' > $@; \ | sed '\''s;\($*\)\$(OBJEXT)[ :]*;$(subst /,\/,$(FOBJPATH))\/\1\$(OBJEXT) $(subst /,\/,$@): ;g'\'' > $@'
[ -s $@ ] || rm -f $@'
$(FDEPPATH)/$(TARGET)/%.d: %.c $(FDEPPATH)/$(TARGET)/%.d: %.c
@echo making depends for $< @echo making depends for $<
@ -51,7 +50,7 @@ $(FOBJPATH)/%.res: %.rc
endif endif
SOURCES= SOURCES=
-include bld$(PLATFORM).inc include bld$(PLATFORM).inc
ifeq ($(PLATFORM),cyg) ifeq ($(PLATFORM),cyg)
OBJS=$(addprefix $(FOBJPATH)/,$(patsubst %.rc,%.o,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(filter %.c %.cpp %.rc,$(SOURCES)))))) OBJS=$(addprefix $(FOBJPATH)/,$(patsubst %.rc,%.o,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(filter %.c %.cpp %.rc,$(SOURCES))))))
else else
@ -69,6 +68,8 @@ clean:
ifeq ($(FDEPPATH)/dep,$(wildcard $(FDEPPATH)/de?)) ifeq ($(FDEPPATH)/dep,$(wildcard $(FDEPPATH)/de?))
ifneq ($(DEPS),) ifneq ($(DEPS),)
-include $(DEPS) include $(DEPS)
endif endif
endif endif