RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:37:45 +00:00
Code Issues Activity Actions

LibHTML: Let's just build host-side tools in makeall.sh instead

Browse source 
Instead of trying to build the host-side code generator helpers right
before we need them in the LibHTML build process, just build them ahead
of time in makeall.sh, like we already do for {IPC,Form}Compiler.
This commit is contained in:
Andreas Kling 2019-11-18 16:28:48 +01:00
parent 85d7afb6df
commit da23864c8d
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/makeall.sh
View file

@ -18,6 +18,8 @@ build_targets=""
# Build the host-side tools first, since they are needed to build some programs. # Build the host-side tools first, since they are needed to build some programs.
build_targets="$build_targets ../DevTools/IPCCompiler" build_targets="$build_targets ../DevTools/IPCCompiler"
build_targets="$build_targets ../DevTools/FormCompiler" build_targets="$build_targets ../DevTools/FormCompiler"
build_targets="$build_targets ../LibHTML/CodeGenerators/CodeGenerators/Generate_CSS_PropertyID_cpp"
build_targets="$build_targets ../LibHTML/CodeGenerators/CodeGenerators/Generate_CSS_PropertyID_h"
# Build LibC, LibCore, LibIPC and LibThread before IPC servers, since they depend on them. # Build LibC, LibCore, LibIPC and LibThread before IPC servers, since they depend on them.
build_targets="$build_targets ../Libraries/LibC" build_targets="$build_targets ../Libraries/LibC"

6
Libraries/LibHTML/Makefile
View file

@ -79,13 +79,9 @@ CSS/DefaultStyleSheetSource.cpp: CSS/Default.css Scripts/GenerateStyleSheetSourc
@echo "GENERATE $@"; Scripts/GenerateStyleSheetSource.sh default_stylesheet_source $< > $@ @echo "GENERATE $@"; Scripts/GenerateStyleSheetSource.sh default_stylesheet_source $< > $@
CSS/PropertyID.h: CSS/Properties.json CodeGenerators/Generate_CSS_PropertyID_h/Generate_CSS_PropertyID_h.cpp CSS/PropertyID.h: CSS/Properties.json CodeGenerators/Generate_CSS_PropertyID_h/Generate_CSS_PropertyID_h.cpp
make -C CodeGenerators/Generate_CSS_PropertyID_h clean
make -C CodeGenerators/Generate_CSS_PropertyID_h
@echo "GENERATE $@"; CodeGenerators/Generate_CSS_PropertyID_h/Generate_CSS_PropertyID_h $< > $@ @echo "GENERATE $@"; CodeGenerators/Generate_CSS_PropertyID_h/Generate_CSS_PropertyID_h $< > $@
CSS/PropertyID.cpp: CSS/Properties.json CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp.cpp CSS/PropertyID.cpp: CSS/Properties.json CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp.cpp
make -C CodeGenerators/Generate_CSS_PropertyID_cpp clean
make -C CodeGenerators/Generate_CSS_PropertyID_cpp
@echo "GENERATE $@"; CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp $< > $@ @echo "GENERATE $@"; CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp $< > $@
%.o: %.cpp $(GENERATED_SOURCES) %.o: %.cpp $(GENERATED_SOURCES)
@ -94,8 +90,6 @@ CSS/PropertyID.cpp: CSS/Properties.json CodeGenerators/Generate_CSS_PropertyID_c
-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)
clean: clean:
make -C CodeGenerators/Generate_CSS_PropertyID_h clean
make -C CodeGenerators/Generate_CSS_PropertyID_cpp clean
@echo "CLEAN"; rm -f $(LIBRARY) $(OBJS) *.d $(GENERATED_SOURCES) @echo "CLEAN"; rm -f $(LIBRARY) $(OBJS) *.d $(GENERATED_SOURCES)
$(LIBRARY): $(GENERATED_SOURCES) $(LIBHTML_OBJS) $(LIBRARY): $(GENERATED_SOURCES) $(LIBHTML_OBJS)