From da23864c8deb6ef999d4f5ed6cdbac30b040ec4f Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 18 Nov 2019 16:28:48 +0100 Subject: [PATCH] LibHTML: Let's just build host-side tools in makeall.sh instead 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. --- Kernel/makeall.sh | 2 ++ Libraries/LibHTML/Makefile | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh index e6942443fb..5de94b885d 100755 --- a/Kernel/makeall.sh +++ b/Kernel/makeall.sh @@ -18,6 +18,8 @@ build_targets="" # 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/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_targets="$build_targets ../Libraries/LibC" diff --git a/Libraries/LibHTML/Makefile b/Libraries/LibHTML/Makefile index bb4f708ae6..cb38b174e8 100644 --- a/Libraries/LibHTML/Makefile +++ b/Libraries/LibHTML/Makefile @@ -79,13 +79,9 @@ CSS/DefaultStyleSheetSource.cpp: CSS/Default.css Scripts/GenerateStyleSheetSourc @echo "GENERATE $@"; Scripts/GenerateStyleSheetSource.sh default_stylesheet_source $< > $@ 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 $< > $@ 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 $< > $@ %.o: %.cpp $(GENERATED_SOURCES) @@ -94,8 +90,6 @@ CSS/PropertyID.cpp: CSS/Properties.json CodeGenerators/Generate_CSS_PropertyID_c -include $(OBJS:%.o=%.d) 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) $(LIBRARY): $(GENERATED_SOURCES) $(LIBHTML_OBJS)