mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-04-21 03:55:24 +00:00
LibHTML: Get rid of dual Makefile setup
It's no longer possible to build LibHTML on the host machine since it depends on LibGUI now. This patch gets rid of the dual Makefiles in LibHTML since we only support Serenity builds anyway. Also clean the code generator directory before building it.
This commit is contained in:
Andreas Kling
parent
1309c45cc6
commit
a116a4a180
Notes:
sideshowbarker
2024-07-19 11:09:39 +09:00
Author: https://github.com/awesomekling Commit: https://github.com/SerenityOS/serenity/commit/a116a4a180b
3 changed files with 94 additions and 121 deletions
|
|
@ -4,7 +4,100 @@ LIBRARY = libhtml.a
|
|||
|
||||
all: $(LIBRARY)
|
||||
|
||||
include Makefile.shared
|
||||
LIBHTML_OBJS = \
|
||||
CSS/DefaultStyleSheetSource.o \
|
||||
CSS/PropertyID.o \
|
||||
CSS/Selector.o \
|
||||
CSS/SelectorEngine.o \
|
||||
CSS/StyleDeclaration.o \
|
||||
CSS/StyleProperties.o \
|
||||
CSS/StyleResolver.o \
|
||||
CSS/StyleRule.o \
|
||||
CSS/StyleSheet.o \
|
||||
CSS/StyleValue.o \
|
||||
DOM/CharacterData.o \
|
||||
DOM/Comment.o \
|
||||
DOM/Document.o \
|
||||
DOM/DocumentType.o \
|
||||
DOM/Element.o \
|
||||
DOM/ElementFactory.o \
|
||||
DOM/HTMLAnchorElement.o \
|
||||
DOM/HTMLBRElement.o \
|
||||
DOM/HTMLBlinkElement.o \
|
||||
DOM/HTMLBodyElement.o \
|
||||
DOM/HTMLElement.o \
|
||||
DOM/HTMLFontElement.o \
|
||||
DOM/HTMLHRElement.o \
|
||||
DOM/HTMLHeadElement.o \
|
||||
DOM/HTMLHeadingElement.o \
|
||||
DOM/HTMLHtmlElement.o \
|
||||
DOM/HTMLImageElement.o \
|
||||
DOM/HTMLLinkElement.o \
|
||||
DOM/HTMLStyleElement.o \
|
||||
DOM/HTMLTitleElement.o \
|
||||
DOM/Node.o \
|
||||
DOM/ParentNode.o \
|
||||
DOM/Text.o \
|
||||
DOMTreeModel.o \
|
||||
Dump.o \
|
||||
FontCache.o \
|
||||
Frame.o \
|
||||
HtmlView.o \
|
||||
Layout/BoxModelMetrics.o \
|
||||
Layout/LayoutBlock.o \
|
||||
Layout/LayoutBox.o \
|
||||
Layout/LayoutBreak.o \
|
||||
Layout/LayoutDocument.o \
|
||||
Layout/LayoutImage.o \
|
||||
Layout/LayoutInline.o \
|
||||
Layout/LayoutListItem.o \
|
||||
Layout/LayoutListItemMarker.o \
|
||||
Layout/LayoutNode.o \
|
||||
Layout/LayoutReplaced.o \
|
||||
Layout/LayoutTable.o \
|
||||
Layout/LayoutTableCell.o \
|
||||
Layout/LayoutTableRow.o \
|
||||
Layout/LayoutText.o \
|
||||
Layout/LayoutTreeBuilder.o \
|
||||
Layout/LineBox.o \
|
||||
Layout/LineBoxFragment.o \
|
||||
Parser/CSSParser.o \
|
||||
Parser/HTMLParser.o \
|
||||
ResourceLoader.o
|
||||
|
||||
GENERATED_SOURCES = \
|
||||
CSS/DefaultStyleSheetSource.cpp \
|
||||
CSS/PropertyID.h \
|
||||
CSS/PropertyID.cpp
|
||||
|
||||
OBJS = $(EXTRA_OBJS) $(LIBHTML_OBJS)
|
||||
|
||||
LIBRARY = libhtml.a
|
||||
DEFINES += -DUSERLAND
|
||||
|
||||
CSS/DefaultStyleSheetSource.cpp: CSS/Default.css Scripts/GenerateStyleSheetSource.sh
|
||||
@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 $< > $@
|
||||
|
||||
.cpp.o:
|
||||
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -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)
|
||||
@echo "LIB $@"; $(AR) rcs $@ $(LIBHTML_OBJS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
all: tho
|
||||
|
||||
CXX = ccache g++
|
||||
CXXFLAGS = -W -Wall -O -g -I. -I../ -I../../ -std=c++17
|
||||
|
||||
EXTRA_OBJS = \
|
||||
../../AK/StringImpl.o \
|
||||
../../AK/String.o \
|
||||
../../AK/StringBuilder.o \
|
||||
../../AK/StringView.o \
|
||||
../../AK/LogStream.o \
|
||||
../../AK/JsonValue.o \
|
||||
../../AK/JsonParser.o \
|
||||
../LibCore/CEventLoop.o \
|
||||
../LibCore/CObject.o \
|
||||
../LibCore/CEvent.o \
|
||||
../LibCore/CIODevice.o \
|
||||
../LibCore/CLocalServer.o \
|
||||
../LibCore/CLocalSocket.o \
|
||||
../LibCore/CSocket.o \
|
||||
../LibCore/CNotifier.o \
|
||||
../LibCore/CFile.o
|
||||
|
||||
include Makefile.shared
|
||||
|
||||
tho: $(OBJS)
|
||||
$(CXX) -o $@ $(LDFLAGS) $(OBJS)
|
||||
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
LIBHTML_OBJS = \
|
||||
DOM/Node.o \
|
||||
DOM/ParentNode.o \
|
||||
DOM/Element.o \
|
||||
DOM/HTMLElement.o \
|
||||
DOM/HTMLAnchorElement.o \
|
||||
DOM/HTMLHeadingElement.o \
|
||||
DOM/HTMLHeadElement.o \
|
||||
DOM/HTMLHRElement.o \
|
||||
DOM/HTMLHtmlElement.o \
|
||||
DOM/HTMLStyleElement.o \
|
||||
DOM/HTMLTitleElement.o \
|
||||
DOM/HTMLBodyElement.o \
|
||||
DOM/HTMLFontElement.o \
|
||||
DOM/HTMLImageElement.o \
|
||||
DOM/HTMLLinkElement.o \
|
||||
DOM/HTMLBlinkElement.o \
|
||||
DOM/HTMLBRElement.o \
|
||||
DOM/Document.o \
|
||||
DOM/CharacterData.o \
|
||||
DOM/Comment.o \
|
||||
DOM/Text.o \
|
||||
DOM/DocumentType.o \
|
||||
DOM/ElementFactory.o \
|
||||
CSS/PropertyID.o \
|
||||
CSS/Selector.o \
|
||||
CSS/StyleSheet.o \
|
||||
CSS/StyleRule.o \
|
||||
CSS/StyleDeclaration.o \
|
||||
CSS/StyleValue.o \
|
||||
CSS/StyleProperties.o \
|
||||
CSS/StyleResolver.o \
|
||||
CSS/DefaultStyleSheetSource.o \
|
||||
CSS/SelectorEngine.o \
|
||||
Parser/HTMLParser.o \
|
||||
Parser/CSSParser.o \
|
||||
Layout/LayoutNode.o \
|
||||
Layout/LayoutBox.o \
|
||||
Layout/LayoutText.o \
|
||||
Layout/LayoutBlock.o \
|
||||
Layout/LayoutInline.o \
|
||||
Layout/LayoutDocument.o \
|
||||
Layout/LayoutReplaced.o \
|
||||
Layout/LayoutImage.o \
|
||||
Layout/LayoutListItem.o \
|
||||
Layout/LayoutListItemMarker.o \
|
||||
Layout/LayoutBreak.o \
|
||||
Layout/LayoutTable.o \
|
||||
Layout/LayoutTableRow.o \
|
||||
Layout/LayoutTableCell.o \
|
||||
Layout/BoxModelMetrics.o \
|
||||
Layout/LineBox.o \
|
||||
Layout/LineBoxFragment.o \
|
||||
Layout/LayoutTreeBuilder.o \
|
||||
DOMTreeModel.o \
|
||||
FontCache.o \
|
||||
ResourceLoader.o \
|
||||
HtmlView.o \
|
||||
Frame.o \
|
||||
Dump.o
|
||||
|
||||
GENERATED_SOURCES = \
|
||||
CSS/DefaultStyleSheetSource.cpp \
|
||||
CSS/PropertyID.h \
|
||||
CSS/PropertyID.cpp
|
||||
|
||||
OBJS = $(EXTRA_OBJS) $(LIBHTML_OBJS)
|
||||
|
||||
LIBRARY = libhtml.a
|
||||
DEFINES += -DUSERLAND
|
||||
|
||||
CSS/DefaultStyleSheetSource.cpp: CSS/Default.css Scripts/GenerateStyleSheetSource.sh
|
||||
@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
|
||||
@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
|
||||
@echo "GENERATE $@"; CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp $< > $@
|
||||
|
||||
.cpp.o:
|
||||
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -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)
|
||||
|
||||
Loading…
Add table
Reference in a new issue