comparison src/Makefile @ 20223:57a69af99e48 v8.2.0667

patch 8.2.0667: cannot install Haiku version from source Commit: https://github.com/vim/vim/commit/2c5c1638a9fe2ef34f2fd09ed69e10ef2e821f0a Author: Bram Moolenaar <Bram@vim.org> Date: Thu Apr 30 19:54:38 2020 +0200 patch 8.2.0667: cannot install Haiku version from source Problem: Cannot install Haiku version from source. Solution: Update Makefile and rdef file. (Emir Sari, closes https://github.com/vim/vim/issues/6013)
author Bram Moolenaar <Bram@vim.org>
date Thu, 30 Apr 2020 20:00:04 +0200
parents 3e2f6ef8ab4f
children ee5c653b946f
comparison
equal deleted inserted replaced
20222:fece96aeff70 20223:57a69af99e48
2883 # Clean up all the files that have been produced, except configure's. 2883 # Clean up all the files that have been produced, except configure's.
2884 # We support common typing mistakes for Juergen! :-) 2884 # We support common typing mistakes for Juergen! :-)
2885 clean celan: testclean 2885 clean celan: testclean
2886 -rm -f *.o core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o 2886 -rm -f *.o core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
2887 -rm -rf objects 2887 -rm -rf objects
2888 -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h 2888 -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h auto/os_haiku.rdef
2889 -rm -f conftest* *~ auto/link.sed 2889 -rm -f conftest* *~ auto/link.sed
2890 -rm -f testdir/opt_test.vim 2890 -rm -f testdir/opt_test.vim
2891 -rm -f $(UNITTEST_TARGETS) 2891 -rm -f $(UNITTEST_TARGETS)
2892 -rm -f runtime pixmaps 2892 -rm -f runtime pixmaps
2893 -rm -rf $(APPDIR) 2893 -rm -rf $(APPDIR)
3040 $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ 3040 $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
3041 3041
3042 auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in 3042 auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
3043 CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh 3043 CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
3044 3044
3045 auto/os_haiku.rdef: os_haiku.rdef.in
3046 @echo creating $@
3047 @echo '/* This file is automatically created by Makefile */' >> $@
3048 @echo '/* DO NOT EDIT! Change Makefile only. */' >> $@
3049 @cat $(srcdir)/os_haiku.rdef.in >> auto/os_haiku.rdef
3050 sed -i "s|@MAJOR@|$(VIMMAJOR)|" auto/os_haiku.rdef
3051 sed -i "s|@MINOR@|$(VIMMINOR)|" auto/os_haiku.rdef
3052
3045 auto/pathdef.c: Makefile auto/config.mk 3053 auto/pathdef.c: Makefile auto/config.mk
3046 -@echo creating $@ 3054 -@echo creating $@
3047 -@echo '/* pathdef.c */' > $@ 3055 -@echo '/* pathdef.c */' > $@
3048 -@echo '/* This file is automatically created by Makefile' >> $@ 3056 -@echo '/* This file is automatically created by Makefile' >> $@
3049 -@echo ' * DO NOT EDIT! Change Makefile only. */' >> $@ 3057 -@echo ' * DO NOT EDIT! Change Makefile only. */' >> $@
3382 $(CCC) -o $@ os_beos.c 3390 $(CCC) -o $@ os_beos.c
3383 3391
3384 objects/os_qnx.o: os_qnx.c 3392 objects/os_qnx.o: os_qnx.c
3385 $(CCC) -o $@ os_qnx.c 3393 $(CCC) -o $@ os_qnx.c
3386 3394
3387 objects/os_haiku.rsrc: os_haiku.rdef 3395 objects/os_haiku.rsrc: auto/os_haiku.rdef
3388 cat $< | $(CCC) -E - | grep -v '^#' | rc -o "$@" - 3396 cat $< | $(CCC) -E - | grep -v '^#' | rc -o "$@" -
3389 3397
3390 objects/os_macosx.o: os_macosx.m 3398 objects/os_macosx.o: os_macosx.m
3391 $(CCC) -o $@ os_macosx.m 3399 $(CCC) -o $@ os_macosx.m
3392 3400