]> rtime.felk.cvut.cz Git - omk.git/commitdiff
Merge branch 'devel' of sojka@rtime.felk.cvut.cz:/var/git/omk into devel
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 13 Dec 2008 19:48:34 +0000 (20:48 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 13 Dec 2008 19:48:34 +0000 (20:48 +0100)
1  2 
snippets/linux

diff --combined snippets/linux
index a48277afe2125411033dd524d2c350440c3dd0ed,2be4bea0fd2009cded3c755119c8fff3fb736699..4b0d1358966e047bb96d43e7b2c185504d538687
@@@ -411,7 -411,7 +411,7 @@@ $(2)/$(1)$(EXE_SUFFIX): $$($(1)_objs
        @echo >>$$(dir)/$(1).exe.d
  endef
  
- -include $(shell find $(USER_BUILD_DIR) -name '*.omkvar')
+ -include $(shell true; find $(USER_BUILD_DIR) -name '*.omkvar') # `true' is a hack for MinGW
  #$(warning $(shared_libs))
  $(foreach lib,$(shared_libs),$(eval $(call solib_link_template,$(lib))))
  $(foreach prg,$(bin_programs),$(eval $(call program_link_template,$(prg),$(USER_BIN_DIR))))
@@@ -851,5 -851,5 +851,5 @@@ default: kernel-lib-pass kernel-pas
  endif
  
  # Local Variables:
 -# mode:makefile
 +# mode:makefile-gmake
  # End: