Build: support library and generator dependencies

Instead of directly manipulating LDFLAGS, set LIB_DEPS in each subdirectory Makefile listing the libraries needed for building/linking such as "LIB_DEPS = Core GUI Draw IPC Core". This adds each library as an -L and -l argument in LDFLAGS, but also adds the library.a file as a link dependency on the current $(PROGRAM). This causes the given library to be (re)built before linking the current $(PROGRAM), but will also re-link any binaries depending on that library when it is modified, when running make from the root directory. Also turn generator tools like IPCCompiler into dependencies on the files they generate, so they are built on-demand when a particular directory needs them. This all allows the root Makefile to just list directories and not care about the order, as all of the dependency tracking will figure it out.
abyesilyurt · Dec 25, 2019 · c127d16 · c127d16
1 parent 2aeae2a
commit c127d16
Show file tree

Hide file tree

Showing 47 changed files with 130 additions and 113 deletions.
diff --git a/Applications/About/Makefile b/Applications/About/Makefile
@@ -3,7 +3,7 @@ OBJS = \
 
 PROGRAM = About
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI Draw IPC Core
 
 DEFINES += -DGIT_COMMIT=\"`git rev-parse --short HEAD`\" -DGIT_BRANCH=\"`git rev-parse --abbrev-ref HEAD`\" -DGIT_CHANGES=\"`git diff-index --quiet HEAD -- && echo "tracked"|| echo "untracked"`\"
 

diff --git a/Applications/Browser/Makefile b/Applications/Browser/Makefile
@@ -3,6 +3,10 @@ OBJS = \
 
 PROGRAM = Browser
 
-LDFLAGS = -lgui -lhtml -ldraw -lprotocol -lipc -lcore -lc
+LIB_DEPS = GUI HTML Draw IPC Protocol Core
+
+main.cpp: ../../Libraries/LibHTML/CSS/PropertyID.h
+../../Libraries/LibHTML/CSS/PropertyID.h:
+ @$(MAKE) -C ../../Libraries/LibHTML
 
 include ../../Makefile.common
diff --git a/Applications/Calculator/Makefile b/Applications/Calculator/Makefile
@@ -6,6 +6,6 @@ OBJS = \
 
 PROGRAM = Calculator
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI Draw IPC Core
 
 include ../../Makefile.common
diff --git a/Applications/ChanViewer/Makefile b/Applications/ChanViewer/Makefile
@@ -5,6 +5,6 @@ OBJS = \
 
 PROGRAM = ChanViewer
 
-LDFLAGS = -lgui -ldraw -lipc -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI Draw IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/DisplayProperties/Makefile b/Applications/DisplayProperties/Makefile
@@ -4,6 +4,6 @@ OBJS = \
 
 PROGRAM = DisplayProperties
 
-LDFLAGS = -lgui -ldraw -lipc -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI Draw IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/FileManager/Makefile b/Applications/FileManager/Makefile
@@ -6,6 +6,6 @@ OBJS = \
 
 PROGRAM = FileManager
 
-LDFLAGS = -lgui -ldraw -lipc -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI Draw IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/FontEditor/Makefile b/Applications/FontEditor/Makefile
@@ -6,12 +6,12 @@ OBJS = \
 
 PROGRAM = FontEditor
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI Draw Core IPC
 
 FontEditor.cpp: UI_FontEditorBottom.h
 
-UI_FontEditorBottom.h: FontEditorBottom.frm
- ../../DevTools/FormCompiler/FormCompiler $< > $@
+UI_FontEditorBottom.h: FontEditorBottom.frm FORMCOMPILER
+ $(QUIET) $(FORMCOMPILER) $< > $@
 
 EXTRA_CLEAN = UI_FontEditorBottom.h
 

diff --git a/Applications/Help/Makefile b/Applications/Help/Makefile
@@ -7,6 +7,6 @@ OBJS = \
 
 PROGRAM = Help
 
-LDFLAGS = -lgui -lhtml -lmarkdown -ldraw -lipc -lprotocol -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI HTML Draw Markdown IPC Protocol Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/HexEditor/Makefile b/Applications/HexEditor/Makefile
@@ -5,6 +5,6 @@ OBJS = \
 
 PROGRAM = HexEditor
 
-LDFLAGS = -lgui -ldraw -lipc -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI Draw IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/IRCClient/Makefile b/Applications/IRCClient/Makefile
@@ -11,6 +11,6 @@ OBJS = \
 
 PROGRAM = IRCClient
 
-LDFLAGS = -lgui -lhtml -ldraw -lprotocol -lipc -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI HTML Draw Protocol IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/PaintBrush/Makefile b/Applications/PaintBrush/Makefile
@@ -14,6 +14,6 @@ OBJS = \
 
 PROGRAM = PaintBrush
 
-LDFLAGS = -lgui -ldraw -lipc -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI Draw IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/Piano/Makefile b/Applications/Piano/Makefile
@@ -4,6 +4,6 @@ OBJS = \
 
 PROGRAM = Piano
 
-LDFLAGS = -lgui -ldraw -laudio -lipc -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI Draw Audio IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/QuickShow/Makefile b/Applications/QuickShow/Makefile
@@ -4,6 +4,6 @@ OBJS = \
 
 PROGRAM = QuickShow
 
-LDFLAGS = -lgui -ldraw -lprotocol -lipc -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI Draw Protocol IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/SoundPlayer/Makefile b/Applications/SoundPlayer/Makefile
@@ -6,6 +6,6 @@ OBJS = \
 
 PROGRAM = SoundPlayer
 
-LDFLAGS = -lgui -ldraw -laudio -lipc -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI Draw Audio IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/SystemDialog/Makefile b/Applications/SystemDialog/Makefile
@@ -3,6 +3,6 @@ OBJS = \
 
 PROGRAM = SystemDialog
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI Draw IPC Core
 
 include ../../Makefile.common
diff --git a/Applications/SystemMonitor/Makefile b/Applications/SystemMonitor/Makefile
@@ -12,6 +12,6 @@ OBJS = \
 
 PROGRAM = SystemMonitor
 
-LDFLAGS = -lgui -ldraw -lprotocol -lpcidb -lipc -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI Draw Protocol PCIDB IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/Taskbar/Makefile b/Applications/Taskbar/Makefile
@@ -6,6 +6,6 @@ OBJS = \
 
 PROGRAM = Taskbar
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI Draw IPC Core
 
 include ../../Makefile.common
diff --git a/Applications/Terminal/Makefile b/Applications/Terminal/Makefile
@@ -3,6 +3,6 @@ OBJS = \
 
 PROGRAM = Terminal
 
-LDFLAGS = -lgui -ldraw -lvt -lprotocol -lipc -lcore -lc
+LIB_DEPS = GUI Draw VT IPC Protocol Core
 
 include ../../Makefile.common
diff --git a/Applications/TextEditor/Makefile b/Applications/TextEditor/Makefile
@@ -4,6 +4,6 @@ OBJS = \
 
 PROGRAM = TextEditor
 
-LDFLAGS = -lgui -ldraw -lvt -lipc -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI Draw VT IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/Welcome/Makefile b/Applications/Welcome/Makefile
@@ -5,7 +5,7 @@ OBJS = \
 
 PROGRAM = Welcome
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI Draw IPC Core
 
 .SUFFIXES: .png
 %.png.o: %.png

diff --git a/Demos/Fire/Makefile b/Demos/Fire/Makefile
@@ -3,6 +3,6 @@ OBJS = \
 
 PROGRAM = Fire
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI IPC Draw Core
 
 include ../../Makefile.common
diff --git a/Demos/HelloWorld/Makefile b/Demos/HelloWorld/Makefile
@@ -3,6 +3,6 @@ OBJS = \
 
 PROGRAM = HelloWorld
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI IPC Draw Core
 
 include ../../Makefile.common
diff --git a/Demos/HelloWorld2/Makefile b/Demos/HelloWorld2/Makefile
@@ -3,7 +3,7 @@ OBJS = \
 
 PROGRAM = HelloWorld2
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI IPC Draw Core
 
 main.cpp: UI_HelloWorld2.h
 

diff --git a/Demos/WidgetGallery/Makefile b/Demos/WidgetGallery/Makefile
@@ -3,6 +3,6 @@ OBJS = \
 
 PROGRAM = WidgetGallery
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI IPC Draw Core
 
 include ../../Makefile.common
diff --git a/DevTools/HackStudio/Makefile b/DevTools/HackStudio/Makefile
@@ -18,6 +18,6 @@ OBJS = \
 
 PROGRAM = HackStudio
 
-LDFLAGS = -lvt -lhtml -lprotocol -lipc -lmarkdown -lgui -ldraw -lthread -lpthread -lcore -lc
+LIB_DEPS = GUI HTML VT Protocol Markdown Draw IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/DevTools/Inspector/Makefile b/DevTools/Inspector/Makefile
@@ -7,6 +7,6 @@ OBJS = \
 
 PROGRAM = Inspector
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI Draw IPC Core
 
 include ../../Makefile.common
diff --git a/DevTools/ProfileViewer/Makefile b/DevTools/ProfileViewer/Makefile
@@ -6,6 +6,6 @@ OBJS = \
 
 PROGRAM = ProfileViewer
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI Draw IPC Core
 
 include ../../Makefile.common
diff --git a/DevTools/VisualBuilder/Makefile b/DevTools/VisualBuilder/Makefile
@@ -9,6 +9,6 @@ OBJS = \
 
 PROGRAM = VisualBuilder
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI Draw IPC Core
 
 include ../../Makefile.common
diff --git a/Games/Minesweeper/Makefile b/Games/Minesweeper/Makefile
@@ -4,6 +4,6 @@ OBJS = \
 
 PROGRAM = Minesweeper
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI IPC Draw Core
 
 include ../../Makefile.common
diff --git a/Games/Snake/Makefile b/Games/Snake/Makefile
@@ -4,6 +4,6 @@ OBJS = \
 
 PROGRAM = Snake
 
-LDFLAGS = -lgui -ldraw -lipc -lcore -lc
+LIB_DEPS = GUI IPC Draw Core
 
 include ../../Makefile.common
diff --git a/Libraries/LibAudio/Makefile b/Libraries/LibAudio/Makefile
@@ -4,6 +4,10 @@ OBJS = \
 
 LIBRARY = libaudio.a
 
+AClientConnection.cpp: ../../Servers/AudioServer/AudioClientEndpoint.h
+../../Servers/AudioServer/AudioClientEndpoint.h:
+ @$(MAKE) -C $(dir $(@))
+
 install:
  mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/LibAudio/
  cp *.h $(SERENITY_BASE_DIR)/Root/usr/include/LibAudio/

diff --git a/Libraries/LibC/Makefile b/Libraries/LibC/Makefile
@@ -1,3 +1,5 @@
+.NOTPARALLEL:
+
 AK_OBJS = \
  ../../AK/StringImpl.o \
  ../../AK/String.o \
@@ -59,19 +61,22 @@ OBJS = $(AK_OBJS) $(LIBC_OBJS)
 
 EXTRA_OBJS = setjmp.ao crti.ao crtn.ao
 
-.PHONY: startfiles
-startfiles: $(EXTRA_OBJS)
- $(CXX) $(CXXFLAGS) -o crt0.o -c crt0.cpp
+crt0.o: crt0.cpp
+ $(QUIET) $(CXX) $(CXXFLAGS) -o crt0.o -c crt0.cpp
+
+crtio.o: crti.ao
  $(QUIET) cp crti.ao crti.o
+
+crtn.o: crtin.ao
  $(QUIET) cp crtn.ao crtn.o
 
-EXTRA_CLEAN = crt0.d
+EXTRA_CLEAN = crt0.d crt0.o
 
 DEFINES = -DSERENITY_LIBC_BUILD
 
 LIBRARY = libc.a
 
-all: $(LIBRARY) startfiles install
+all: crt0.o $(EXTRA_OBJS) $(LIBRARY) install
 
 install:
  mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/sys/

diff --git a/Libraries/LibGUI/Makefile b/Libraries/LibGUI/Makefile
@@ -63,6 +63,11 @@ OBJS = \
 
 LIBRARY = libgui.a
 
+GWindowServerConnection.cpp: ../../Servers/WindowServer/WindowServerEndpoint.h
+
+../../Servers/WindowServer/WindowServerEndpoint.h:
+ @$(MAKE) -C $(dir $(@))
+
 install:
  mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/LibGUI/
  cp ./*.h $(SERENITY_BASE_DIR)/Root/usr/include/LibGUI/

diff --git a/Libraries/LibHTML/CodeGenerators/Makefile b/Libraries/LibHTML/CodeGenerators/Makefile
@@ -0,0 +1,3 @@
+SUBDIRS := $(wildcard */.)
+
+include ../../../Makefile.subdir
diff --git a/Libraries/LibHTML/Makefile b/Libraries/LibHTML/Makefile
@@ -67,17 +67,28 @@ EXTRA_SOURCES = \
  CSS/PropertyID.h \
  CSS/PropertyID.cpp
 
+GENERATE_CSS_PROPERTYID_CPP = CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp
+GENERATE_CSS_PROPERTYID_H = CodeGenerators/Generate_CSS_PropertyID_h/Generate_CSS_PropertyID_h
+
+$(GENERATE_CSS_PROPERTYID_H):
+ @$(MAKE) -C $(dir $(GENERATE_CSS_PROPERTYID_H))
+
+$(GENERATE_CSS_PROPERTYID_CPP):
+ @$(MAKE) -C $(dir $(GENERATE_CSS_PROPERTYID_CPP))
+
 CSS/DefaultStyleSheetSource.cpp: CSS/Default.css Scripts/GenerateStyleSheetSource.sh
  @echo "GENERATE $@"
  $(QUIET) 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 $(GENERATE_CSS_PROPERTYID_H)
  @echo "GENERATE $@"
- $(QUIET) CodeGenerators/Generate_CSS_PropertyID_h/Generate_CSS_PropertyID_h $< > $@
+ $(QUIET) $(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 $(GENERATE_CSS_PROPERTYID_CPP)
  @echo "GENERATE $@"
- $(QUIET) CodeGenerators/Generate_CSS_PropertyID_cpp/Generate_CSS_PropertyID_cpp $< > $@
+ $(QUIET) $(GENERATE_CSS_PROPERTYID_CPP) $< > $@
+
+EXTRA_CLEAN = CSS/DefaultStyleSheetSource.cpp CSS/PropertyID.h CSS/PropertyID.cpp
 
 OBJS = $(EXTRA_OBJS) $(LIBHTML_OBJS)
 
@@ -91,3 +102,7 @@ install:
  cp $(LIBRARY) $(SERENITY_BASE_DIR)/Root/usr/lib/
 
 include ../../Makefile.common
+
+SUBDIRS = CodeGenerators
+
+include ../../Makefile.subdir