From 6473ba9c4a35fc98dca4a71ba314caabaec39e38 Mon Sep 17 00:00:00 2001 From: bebbo Date: Wed, 1 May 2019 18:17:43 +0200 Subject: [PATCH] change ndk-include deps (2) --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 35ce9ed..cd70d65 100644 --- a/Makefile +++ b/Makefile @@ -623,9 +623,9 @@ download/vbcc_target_m68k-amigaos.lha: NDK_INCLUDE = $(shell find 2>/dev/null projects/NDK_3.9/Include/include_h -type f) NDK_INCLUDE_SFD = $(shell find 2>/dev/null projects/NDK_3.9/Include/sfd -type f -name *.sfd) -NDK_INCLUDE_INLINE = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/inline/%.h,$(NDK_INCLUDE_SFD)) -NDK_INCLUDE_LVO = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/lvo/%_lib.i,$(NDK_INCLUDE_SFD)) -NDK_INCLUDE_PROTO = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/proto/%.h,$(NDK_INCLUDE_SFD)) +NDK_INCLUDE_INLINE = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/inline/%.h,$(NDK_INCLUDE_SFD)) $(PREFIX)/m68k-amigaos/ndk-include/inline/exec.h +NDK_INCLUDE_LVO = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/lvo/%_lib.i,$(NDK_INCLUDE_SFD)) $(PREFIX)/m68k-amigaos/ndk-include/lvo/exec_lib.i +NDK_INCLUDE_PROTO = $(patsubst projects/NDK_3.9/Include/sfd/%_lib.sfd,$(PREFIX)/m68k-amigaos/ndk-include/proto/%.h,$(NDK_INCLUDE_SFD)) $(PREFIX)/m68k-amigaos/ndk-include/proto/exec.h SYS_INCLUDE2 = $(filter-out $(NDK_INCLUDE_PROTO),$(patsubst projects/NDK_3.9/Include/include_h/%,$(PREFIX)/m68k-amigaos/ndk-include/%, $(NDK_INCLUDE))) .PHONY: ndk-inline ndk-lvo ndk-proto @@ -880,7 +880,7 @@ newlib: $(BUILD)/newlib/_done $(BUILD)/newlib/_done: $(BUILD)/newlib/newlib/libc.a @echo "done" >$@ -$(BUILD)/newlib/newlib/libc.a: $(BUILD)/newlib/newlib/Makefile $(BUILD)/ndk-include_ndk $(NEWLIB_FILES) +$(BUILD)/newlib/newlib/libc.a: $(BUILD)/newlib/newlib/Makefile $(NEWLIB_FILES) @rsync -a $(PWD)/projects/newlib-cygwin/newlib/libc/include/ $(PREFIX)/m68k-amigaos/sys-include $(L0)"make newlib"$(L1) $(MAKE) -C $(BUILD)/newlib/newlib $(L2) $(L0)"install newlib"$(L1) $(MAKE) -C $(BUILD)/newlib/newlib install $(L2)