build library during install target, after libb was copied

This commit is contained in:
bebbo 2024-09-23 12:46:16 +02:00
parent f6846ba502
commit f7db1e85a8
2 changed files with 8 additions and 7 deletions

View File

@ -85,11 +85,6 @@ lib: $(STARTUPS)
libb:
@mkdir -p $@
$(MAKE) one kind=$@ flags="-fbaserel"
cd libb && $(root)/preplib
cd libb && $(root)/mkstub libnix4 libnix.def $$(cat ofiles.txt | xargs)
cd libb && $(CC) -shared -noixemul $$(cat ofiles.txt | xargs) libnix4-support/export*.o -o libnix4.library \
-Wl,-ulibVersionMajor=$(MAJOR),-ulibVersionMinor=$(MINOR),-ulibName=libnix4 \
$(STRIP)
libm020:
@mkdir -p $@
@ -126,10 +121,16 @@ install: install_lib install_libb install_libm020 install_libm020bb install_libm
install_lib:
$(MAKE) install_one kind=lib to=""
mv $(PREFIX)/m68k-amigaos/libnix/lib/libstubs.a $(PREFIX)/m68k-amigaos/lib/
install_libb:
install_libb: install_lib
$(MAKE) install_one kind=libb to="libb/"
rsync libb/libnix4.a $(PREFIX)/m68k-amigaos/libnix/lib/
rsync libb/libnix4.library $(PREFIX)/m68k-amigaos/libnix/
cd libb && $(root)/preplib
cd libb && $(root)/mkstub libnix4 libnix.def $$(cat ofiles.txt | xargs)
cd libb && $(CC) -shared -noixemul $$(cat ofiles.txt | xargs) libnix4-support/export*.o -o libnix4.library \
-Wl,-ulibVersionMajor=$(MAJOR),-ulibVersionMinor=$(MINOR),-ulibName=libnix4 \
$(STRIP)
install_libm020:
$(MAKE) install_one kind=libm020 to="libm020/"
install_libm020bb:

2
mkstub
View File

@ -78,7 +78,7 @@ short __export_stubs_start = -1;
# get last word = var name of exported functions
(if [[ "${1%%.def}" != "$deffile" ]]; then cat $deffile; else m68k-amigaos-objdump -t $* | grep "0000 01 "; fi) | while read line; do
n=$(echo $line | awk '{ print $NF }' | grep -v "___")
n=$(echo $line | awk '{ print $NF }' | grep -v __initlibraries | grep -v __initcpp )
n=${n:1}
if [[ "${n}" == "" ]]; then