diff --git a/Makefile b/Makefile index cc744ea..9855365 100644 --- a/Makefile +++ b/Makefile @@ -462,6 +462,7 @@ LIBNIX=$(patsubst %,$(PREFIX)/m68k-amigaos/libnix/lib/libb/libnix/%,$(LIBNIXLIBS DUMMYSTART=$(PREFIX)/m68k-amigaos/libnix/lib/libnix/ncrt0.o build/libnix/_dummydone: $(DUMMYLIBSP) + mkdir -p build/libnix echo "done" >build/libnix/_dummydone $(DUMMYLIBSP): $(DUMMYSTART) @@ -489,7 +490,7 @@ build/libnix/_done: build/libnix/Makefile @echo "done" >build/libnix/_dummydone @echo "built $(LIBNIX)" -build/libnix/Makefile: build/sys-include/_done build/sys-include/_done2 build/binutils/_done build/gcc/_done projects/libnix/configure $(LIBNIX_SRC) +build/libnix/Makefile: build/sys-include/_done build/sys-include/_done2 build/binutils/_done build/gcc/_done projects/libnix/configure projects/libnix/Makefile.in $(LIBNIX_SRC) @rm -f build/libnix/_dummydone $(MAKE) build/libnix/_dummydone cd build/libnix && AR=m68k-amigaos-ar AS=m68k-amigaos-as CC=m68k-amigaos-gcc $(A) $(PWD)/projects/libnix/configure $(CONFIG_LIBNIX) @@ -550,7 +551,7 @@ projects/clib2/LICENSE: # sdk installation # ================================================= .PHONY: sdk all-sdk -sdk: +sdk: libnix @$(PWD)/sdk/install install $(sdk) $(PREFIX) SDKS0=$(shell find sdk/*.sdk) @@ -558,5 +559,5 @@ SDKS=$(patsubst sdk/%.sdk,%,$(SDKS0)) .PHONY: $(SDKS) all-sdk: $(SDKS) -$(SDKS): +$(SDKS): libnix $(MAKE) sdk=$@ diff --git a/sdk/install b/sdk/install index 46030da..b77c175 100755 --- a/sdk/install +++ b/sdk/install @@ -52,8 +52,9 @@ case $1 in name=${file::-4} mkdir -p $3/m68k-amigaos/include/proto/ $3/bin/sfdc --mode=proto --target=m68k-amigaos --output=$3/m68k-amigaos/include/proto/$name.h $3/m68k-amigaos/lib/sfd/$sfd || exit 1 + sed -e 's/\(\)/\L\1/' -e 's/\(\)/\L\1/' -e 's/\(\)/\L\1/' -e 's/\(\)/\L\1/' $3/m68k-amigaos/include/proto/$name.h -i mkdir -p $3/m68k-amigaos/include/inline/ - $3/bin/sfdc --mode=macros --target=m68k-amigaos --output=$3/m68k-amigaos/include/proto/$name.h $3/m68k-amigaos/lib/sfd/$sfd || exit 1 + $3/bin/sfdc --mode=macros --target=m68k-amigaos --output=$3/m68k-amigaos/include/inline/$name.h $3/m68k-amigaos/lib/sfd/$sfd || exit 1 mkdir -p $3/m68k-amigaos/include/lvo/ $3/bin/sfdc --mode=lvo --target=m68k-amigaos --output=$3/m68k-amigaos/include/proto/$name.i $3/m68k-amigaos/lib/sfd/$sfd || exit 1 ;; @@ -65,8 +66,15 @@ case $1 in sed -e 's/__inline//g' -e 's/: \"d0\",/:/g' build/$2/$name.c -i || exit 1 echo $3/bin/m68k-amigaos-gcc -Os -noixemul -fomit-frame-pointer build/$2/$name.c -c $3/bin/m68k-amigaos-gcc -Os -noixemul -fomit-frame-pointer build/$2/$name.c -c -o build/$2/$name.o || exit 1 - echo $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libnix/libstubs.a build/$2/$name.o + echo $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/lib/libstubs.a build/$2/$name.o $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libnix/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libm020/libnix/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libm020/libm881/libnix/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libb32/libm020/libnix/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libb32/libm020/libm881/libnix/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libb/libnix/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libb/libm020/libnix/libstubs.a build/$2/$name.o || exit 1 + $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libb/libm020/libm881/libnix/libstubs.a build/$2/$name.o || exit 1 ;; lib) sfd=${a[1]} @@ -76,7 +84,7 @@ case $1 in sed -e 's/__inline//g' -e 's/: \"d0\",/:/g' build/$2/lib$2.c -i || exit 1 echo $3/bin/m68k-amigaos-gcc -Os -noixemul -fomit-frame-pointer build/$2/lib$2.c -c $3/bin/m68k-amigaos-gcc -Os -noixemul -fomit-frame-pointer build/$2/lib$2.c -c -o build/$2/lib$2.o || exit 1 - echo $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/libnix/lib/libnix/lib$2.a build/$2/lib$2.o + echo $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/lib/lib$2.a build/$2/lib$2.o $3/bin/m68k-amigaos-ar r $3/m68k-amigaos/lib/lib$2.a build/$2/lib$2.o || exit 1 ;; *)