RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:47:35 +00:00
Code Issues Activity Actions

Libraries: Unbreak "make install" with new directory locations.

Browse source
This commit is contained in:
Andreas Kling 2019-07-04 16:41:42 +02:00
parent 04b9dc2d30
commit 8b0953a795
5 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Libraries/LibC/Makefile
View file

@ -83,12 +83,12 @@ clean:
@echo "CLEAN"; rm -f $(LIBRARY) $(CPP_OBJS) $(ASM_OBJS) *.d @echo "CLEAN"; rm -f $(LIBRARY) $(CPP_OBJS) $(ASM_OBJS) *.d
install: $(LIBRARY) startfiles install: $(LIBRARY) startfiles
mkdir -p ../Root/usr/include mkdir -p ../../Root/usr/include
mkdir -p ../Root/usr/lib mkdir -p ../../Root/usr/lib
# Copy headers # Copy headers
rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../Root/usr/include rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include
# Install the library # Install the library
cp $(LIBRARY) ../Root/usr/lib cp $(LIBRARY) ../../Root/usr/lib
cp crt0.o ../Root/usr/lib/ cp crt0.o ../../Root/usr/lib/
cp crti.ao ../Root/usr/lib/crti.o cp crti.ao ../../Root/usr/lib/crti.o
cp crtn.ao ../Root/usr/lib/crtn.o cp crtn.ao ../../Root/usr/lib/crtn.o

12
Libraries/LibCore/Makefile
View file

@ -39,11 +39,11 @@ clean:
@echo "CLEAN"; rm -f $(LIBRARY) $(OBJS) *.d @echo "CLEAN"; rm -f $(LIBRARY) $(OBJS) *.d
install: $(LIBRARY) install: $(LIBRARY)
mkdir -p ../Root/usr/include/LibCore mkdir -p ../../Root/usr/include/LibCore
mkdir -p ../Root/usr/include/AK mkdir -p ../../Root/usr/include/AK
mkdir -p ../Root/usr/lib mkdir -p ../../Root/usr/lib
# Copy headers # Copy headers
rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../Root/usr/include/LibCore rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include/LibCore
rsync -r -a --include '*/' --include '*.h' --exclude '*' ../AK/ ../Root/usr/include/AK rsync -r -a --include '*/' --include '*.h' --exclude '*' ../../AK/ ../../Root/usr/include/AK
# Install the library # Install the library
cp $(LIBRARY) ../Root/usr/lib cp $(LIBRARY) ../../Root/usr/lib

6
Libraries/LibGUI/Makefile
View file

@ -82,8 +82,8 @@ clean:
@echo "CLEAN"; rm -f $(LIBRARY) $(OBJS) *.d @echo "CLEAN"; rm -f $(LIBRARY) $(OBJS) *.d
install: $(LIBRARY) install: $(LIBRARY)
mkdir -p ../Root/usr/include/LibGUI mkdir -p ../../Root/usr/include/LibGUI
# Copy headers # Copy headers
rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../Root/usr/include/LibGUI rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include/LibGUI
# Install the library # Install the library
cp $(LIBRARY) ../Root/usr/lib cp $(LIBRARY) ../../Root/usr/lib

6
Libraries/LibHTML/Makefile
View file

@ -13,9 +13,9 @@ $(LIBRARY): $(LIBHTML_OBJS)
@echo "LIB $@"; $(AR) rcs $@ $(LIBHTML_OBJS) @echo "LIB $@"; $(AR) rcs $@ $(LIBHTML_OBJS)
install: $(LIBRARY) install: $(LIBRARY)
mkdir -p ../Root/usr/include/LibHTML mkdir -p ../../Root/usr/include/LibHTML
# Copy headers # Copy headers
rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../Root/usr/include/LibHTML rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include/LibHTML
# Install the library # Install the library
cp $(LIBRARY) ../Root/usr/lib cp $(LIBRARY) ../../Root/usr/lib

4
Libraries/LibM/Makefile
View file

@ -20,6 +20,6 @@ clean:
install: $(LIBRARY) install: $(LIBRARY)
# Copy headers # Copy headers
rsync -a --include '*/' --include '*.h' --exclude '*' . ../Root/usr/include rsync -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include
# Install the library # Install the library
cp $(LIBRARY) ../Root/usr/lib cp $(LIBRARY) ../../Root/usr/lib