diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2019-11-14 09:20:02 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2019-11-14 09:20:02 +0100 |
| commit | afb9501f99bf94b05f999cd341dade721f69d023 (patch) | |
| tree | ea7108658df4152cfbde5e84bf010045dac6ff58 /lib/erl_interface/src/Makefile.in | |
| parent | 9adc0b044a1e2a01537775b8076bee29586b4870 (diff) | |
| parent | 78354470a93df501d7803d3a3e51f199ec8c9475 (diff) | |
| download | erlang-afb9501f99bf94b05f999cd341dade721f69d023.tar.gz | |
Merge branch 'dgud/cleanup-windows-build'
* dgud/cleanup-windows-build:
Refactor otp_build env_win32
Speedup depend.mk creation
Refactor win32 configure handling
Diffstat (limited to 'lib/erl_interface/src/Makefile.in')
| -rw-r--r-- | lib/erl_interface/src/Makefile.in | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in index 6e0d3476c7..5dee4dc5ed 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -52,9 +52,7 @@ APPUP_FILE= erl_interface.appup APPUP_SRC= $(APPUP_FILE).src APPUP_TARGET= $(EBINDIR)/$(APPUP_FILE) -USING_MINGW=@MIXED_CYGWIN_MINGW@ -USING_MSYS_VC==@MIXED_MSYS_VC@ -USING_CYGWIN_VC==@MIXED_MSYS_VC@ +USING_MINGW=@MIXED_MINGW@ USING_VC=@MIXED_VC@ ifdef TESTROOT @@ -790,22 +788,17 @@ $(TARGET)/depend.mk: $(TARGET)/config.h $(gen_verbose) $(V_colon)echo "Generating dependency file depend.mk..." @echo "# Generated dependency rules" > $@ - $(V_CC) $(CFLAGS) -MM $(SOURCES) | \ - sed 's&$(TARGET)&\$$\(TARGET\)&g' | \ - sed 's/^.*:/\$$\(ST_OBJDIR\)\/&/' >> $@ - @echo >> $@ - $(V_CC) $(CFLAGS) -MM $(SOURCES) | \ - sed 's&$(TARGET)&\$$\(TARGET\)&g' | \ - sed 's/^.*:/\$$\(MT_OBJDIR\)\/&/' >> $@ - @echo >> $@ - $(V_CC) $(CFLAGS) -MM $(SOURCES) | \ - sed 's&$(TARGET)&\$$\(TARGET\)&g' | \ - sed 's/^.*:/\$$\(MD_OBJDIR\)\/&/' >> $@ - @echo >> $@ - $(V_CC) $(CFLAGS) -MM $(SOURCES) | \ - sed 's&$(TARGET)&\$$\(TARGET\)&g' | \ - sed 's/^.*:/\$$\(MDD_OBJDIR\)\/&/' >> $@ - @echo >> $@ + $(V_CC) $(CFLAGS) -MM $(SOURCES) | \ + sed 's&$(TARGET)&\$$\(TARGET\)&g' > $@.$$$$; \ + sed 's/^.*:/\$$\(ST_OBJDIR\)\/&/' < $@.$$$$ >> $@; \ + echo >> $@; \ + sed 's/^.*:/\$$\(MT_OBJDIR\)\/&/' < $@.$$$$ >> $@; \ + echo >> $@; \ + sed 's/^.*:/\$$\(MD_OBJDIR\)\/&/' < $@.$$$$ >> $@; \ + echo >> $@; \ + sed 's/^.*:/\$$\(MDD_OBJDIR\)\/&/' < $@.$$$$ >> $@; \ + echo >> $@; \ + rm -f $@.$$$$ # For some reason this has to be after 'opt' target -include $(TARGET)/depend.mk |