Move WindowServer into Servers.

Applications/IRCClient/Makefile

@@ -16,7 +16,7 @@ STANDARD_FLAGS = -std=c++17
 WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
 FLAVOR_FLAGS = -fno-exceptions -fno-rtti
 OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I../.. -I. -I../../LibC
+INCLUDE_FLAGS = -I../../Servers -I../.. -I. -I../../LibC
 
 DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND
 

Kernel/makeall.sh

@@ -14,8 +14,8 @@ $make_cmd -C ../LibM clean && \
 $make_cmd -C ../LibM clean && \
 $make_cmd -C ../Servers/LookupServer clean && \
 $make_cmd -C ../Servers/LookupServer && \
-$make_cmd -C ../WindowServer clean && \
-$make_cmd -C ../WindowServer && \
+$make_cmd -C ../Servers/WindowServer clean && \
+$make_cmd -C ../Servers/WindowServer && \
 $make_cmd -C ../LibGUI clean && \
 $make_cmd -C ../LibGUI && \
 $make_cmd -C ../Userland clean && \

Kernel/sync.sh

@@ -89,7 +89,7 @@ cp -v ../Applications/TextEditor/TextEditor mnt/bin/TextEditor
 cp -v ../Applications/IRCClient/IRCClient mnt/bin/IRCClient
 ln -s IRCClient mnt/bin/irc
 cp -v ../Servers/LookupServer/LookupServer mnt/bin/LookupServer
-cp -v ../WindowServer/WindowServer mnt/bin/WindowServer
+cp -v ../Servers/WindowServer/WindowServer mnt/bin/WindowServer
 cp -v kernel.map mnt/
 sh sync-local.sh
 umount mnt

LibGUI/Makefile

@@ -56,7 +56,7 @@ STANDARD_FLAGS = -std=c++17
 WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
 FLAVOR_FLAGS = -fno-exceptions -fno-rtti
 OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I../LibC -I.. -I.
+INCLUDE_FLAGS = -I../LibC -I../Servers -I.. -I.
 
 DEFINES = -DSERENITY -DUSERLAND -DSANITIZE_PTRS -DLIBGUI
 

WindowServer/Makefile → Servers/WindowServer/Makefile

@@ -1,11 +1,11 @@
 SHAREDGRAPHICS_OBJS = \
-    ../SharedGraphics/Painter.o \
-    ../SharedGraphics/Font.o \
-    ../SharedGraphics/Rect.o \
-    ../SharedGraphics/GraphicsBitmap.o \
-    ../SharedGraphics/CharacterBitmap.o \
-    ../SharedGraphics/DisjointRectSet.o \
-    ../SharedGraphics/Color.o
+    ../../SharedGraphics/Painter.o \
+    ../../SharedGraphics/Font.o \
+    ../../SharedGraphics/Rect.o \
+    ../../SharedGraphics/GraphicsBitmap.o \
+    ../../SharedGraphics/CharacterBitmap.o \
+    ../../SharedGraphics/DisjointRectSet.o \
+    ../../SharedGraphics/Color.o
 
 WINDOWSERVER_OBJS = \
     WSMessageReceiver.o \
@@ -28,8 +28,8 @@ STANDARD_FLAGS = -std=c++17
 WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
 FLAVOR_FLAGS = -fno-exceptions -fno-rtti
 OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I.. -I. -I../LibC
-LDFLAGS = -L../LibC
+INCLUDE_FLAGS = -I.. -I../.. -I. -I../../LibC
+LDFLAGS = -L../../LibC
 
 DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND