1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Share variables defined in common GNUmakefile also in cygwin/mingw

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2021-03-21 17:53:20 +09:00
parent 94254117ee
commit cb396d4214
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cygwin/GNUmakefile.in
View File

@ -33,9 +33,7 @@ endif
WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
-include uncommon.mk include $(srcdir)/template/GNUmakefile.in
include $(srcdir)/defs/gmake.mk
SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS) SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT) override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)

7
template/GNUmakefile.in
View File

@ -1,6 +1,11 @@
gnumake = yes gnumake = yes
ifeq ($(filter Makefile,$(MAKEFILE_LIST)),)
include Makefile include Makefile
GNUmakefile: $(srcdir)/template/GNUmakefile.in
endif
override silence := $(if $(findstring s,$(firstword $(MFLAGS))),yes,no) override silence := $(if $(findstring s,$(firstword $(MFLAGS))),yes,no)
ifeq ($(HAVE_BASERUBY),yes) ifeq ($(HAVE_BASERUBY),yes)
@ -10,5 +15,3 @@ endif
include $(srcdir)/defs/universal.mk include $(srcdir)/defs/universal.mk
-include uncommon.mk -include uncommon.mk
include $(srcdir)/defs/gmake.mk include $(srcdir)/defs/gmake.mk
GNUmakefile: $(srcdir)/template/GNUmakefile.in