Include Makefile.common in all other Makefiles.

abyesilyurt · Apr 21, 2019 · 57da00b · 57da00b
1 parent 74b94da
commit 57da00b
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 242 deletions.
diff --git a/Applications/About/Makefile b/Applications/About/Makefile
@@ -1,20 +1,11 @@
+include ../../Makefile.common
+
 OBJS = \
  main.o
 
 APP = About
 
-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
-
-DEFINES = -DSANITIZE_PTRS -DUSERLAND
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-g++
-LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI
+DEFINES += -DUSERLAND
 
 all: $(APP)
 

diff --git a/Applications/Downloader/Makefile b/Applications/Downloader/Makefile
@@ -1,21 +1,11 @@
+include ../../Makefile.common
+
 OBJS = \
  main.o
 
 APP = Downloader
 
-STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation
-WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
-FLAVOR_FLAGS = -fno-exceptions -fno-rtti
-OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I../../Servers -I../.. -I. -I../../LibC
-
-DEFINES = -DSANITIZE_PTRS -DUSERLAND
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-g++
-AR = i686-pc-serenity-ar
-LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI
+DEFINES += -DUSERLAND
 
 all: $(APP)
 

diff --git a/Applications/FileManager/Makefile b/Applications/FileManager/Makefile
@@ -1,22 +1,13 @@
+include ../../Makefile.common
+
 OBJS = \
  DirectoryModel.o \
  DirectoryView.o \
  main.o
 
 APP = FileManager
 
-STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation
-WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
-FLAVOR_FLAGS = -fno-exceptions -fno-rtti
-OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I../.. -I../../Servers -I. -I../../LibC
-
-DEFINES = -DSANITIZE_PTRS -DUSERLAND
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-g++
-LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI
+DEFINES += -DUSERLAND
 
 all: $(APP)
 

diff --git a/Applications/FontEditor/Makefile b/Applications/FontEditor/Makefile
@@ -1,3 +1,5 @@
+include ../../Makefile.common
+
 OBJS = \
  FontEditor.o \
  GlyphMapWidget.o \
@@ -6,19 +8,7 @@ OBJS = \
 
 APP = FontEditor
 
-STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation
-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
-
-DEFINES = -DSANITIZE_PTRS -DUSERLAND
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-g++
-AR = i686-pc-serenity-ar
-LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI
+DEFINES += -DUSERLAND
 
 all: $(APP)
 

diff --git a/Applications/IRCClient/Makefile b/Applications/IRCClient/Makefile
@@ -1,3 +1,5 @@
+include ../../Makefile.common
+
 OBJS = \
  IRCClient.o \
  IRCChannel.o \
@@ -12,19 +14,7 @@ OBJS = \
 
 APP = IRCClient
 
-STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation
-WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
-FLAVOR_FLAGS = -fno-exceptions -fno-rtti
-OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I../../Servers -I../.. -I. -I../../LibC
-
-DEFINES = -DSANITIZE_PTRS -DUSERLAND
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-g++
-AR = i686-pc-serenity-ar
-LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI
+DEFINES += -DUSERLAND
 
 all: $(APP)
 

diff --git a/Applications/Launcher/Makefile b/Applications/Launcher/Makefile
@@ -1,20 +1,11 @@
+include ../../Makefile.common
+
 OBJS = \
  main.o
 
 APP = Launcher
 
-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
-
-DEFINES = -DSANITIZE_PTRS -DUSERLAND
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-g++
-LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI
+DEFINES += -DUSERLAND
 
 all: $(APP)
 

diff --git a/Applications/ProcessManager/Makefile b/Applications/ProcessManager/Makefile
@@ -1,3 +1,5 @@
+include ../../Makefile.common
+
 OBJS = \
  ProcessModel.o \
  ProcessTableView.o \
@@ -6,18 +8,7 @@ OBJS = \
 
 APP = ProcessManager
 
-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
-
-DEFINES = -DSANITIZE_PTRS -DUSERLAND
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-g++
-LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI
+DEFINES += -DUSERLAND
 
 all: $(APP)
 

diff --git a/Applications/Taskbar/Makefile b/Applications/Taskbar/Makefile
@@ -1,22 +1,13 @@
+include ../../Makefile.common
+
 OBJS = \
  TaskbarWindow.o \
  WindowList.o \
  main.o
 
 APP = Taskbar
 
-STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation
-WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
-FLAVOR_FLAGS = -fno-exceptions -fno-rtti
-OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I../.. -I../../Servers -I. -I../../LibC
-
-DEFINES = -DSANITIZE_PTRS -DUSERLAND
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-g++
-LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI
+DEFINES += -DUSERLAND
 
 all: $(APP)
 

diff --git a/Applications/Terminal/Makefile b/Applications/Terminal/Makefile
@@ -1,21 +1,12 @@
+include ../../Makefile.common
+
 OBJS = \
  Terminal.o \
  main.o
 
 APP = Terminal
 
-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
-
-DEFINES = -DSANITIZE_PTRS -DUSERLAND
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-g++
-LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI
+DEFINES += -DUSERLAND
 
 all: $(APP)
 

diff --git a/Applications/TextEditor/Makefile b/Applications/TextEditor/Makefile
@@ -1,20 +1,11 @@
+include ../../Makefile.common
+
 OBJS = \
  main.o
 
 APP = TextEditor
 
-STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation
-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
-
-DEFINES = -DSANITIZE_PTRS -DUSERLAND
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-g++
-LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI
+DEFINES += -DUSERLAND
 
 all: $(APP)
 

diff --git a/Applications/VisualBuilder/Makefile b/Applications/VisualBuilder/Makefile
@@ -1,3 +1,5 @@
+include ../../Makefile.common
+
 OBJS = \
  VBForm.o \
  VBWidget.o \
@@ -9,18 +11,7 @@ OBJS = \
 
 APP = VisualBuilder 
 
-STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation
-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
-
-DEFINES = -DSANITIZE_PTRS -DUSERLAND
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-g++
-LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI
+DEFINES += -DUSERLAND
 
 all: $(APP)
 

diff --git a/Kernel/Makefile b/Kernel/Makefile
@@ -1,3 +1,5 @@
+include ../Makefile.common
+
 KERNEL_OBJS = \
  init.o \
  kmalloc.o \
@@ -77,24 +79,10 @@ CXX_OBJS = $(KERNEL_OBJS) $(VFS_OBJS) $(AK_OBJS)
 OBJS = $(CXX_OBJS) Boot/boot.ao
 
 KERNEL = kernel
-ARCH_FLAGS =
-STANDARD_FLAGS = -std=c++17 -nostdinc++ -nostdlib -nostdinc
-KERNEL_FLAGS = -ffreestanding
-WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
-FLAVOR_FLAGS = -mregparm=3 -fno-exceptions -fno-rtti
-OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I.. -I.
-CLANG_FLAGS = -Wconsumed -m32 -ffreestanding -march=i686
-#SUGGEST_FLAGS = -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override #-Wsuggest-attribute=noreturn 
-
-DEFINES = -DKERNEL -DSANITIZE_PTRS
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(KERNEL_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(SUGGEST_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-#CXX = clang $(CLANG_FLAGS)
-CXX = i686-pc-serenity-g++
+CXXFLAGS += -ffreestanding -mregparm=3
+DEFINES += -DKERNEL
 LD = i686-pc-serenity-ld
-AS = i686-pc-serenity-as
-LDFLAGS = -T linker.ld
+LDFLAGS += -T linker.ld
 
 all: $(KERNEL) kernel.map
 

diff --git a/LibC/Makefile b/LibC/Makefile
@@ -1,3 +1,5 @@
+include ../Makefile.common
+
 AK_OBJS = \
  ../AK/StringImpl.o \
  ../AK/String.o \
@@ -48,19 +50,7 @@ ASM_OBJS = setjmp.no crti.ao crtn.ao
 CPP_OBJS = $(AK_OBJS) $(WIDGETS_OBJS) $(LIBC_OBJS)
 
 LIBRARY = libc.a
-STANDARD_FLAGS = -std=c++17
-WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
-FLAVOR_FLAGS = -fno-exceptions -fno-rtti -fno-sized-deallocation
-OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I.. -I.
-
-DEFINES = -DUSERLAND -DSANITIZE_PTRS
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-ld
-AR = i686-pc-serenity-ar
-AS = i686-pc-serenity-as
+DEFINES += -DUSERLAND
 
 all: $(LIBRARY) startfiles
 

diff --git a/LibCore/Makefile b/LibCore/Makefile
@@ -1,3 +1,5 @@
+include ../Makefile.common
+
 OBJS = \
  CIODevice.o \
  CFile.o \
@@ -17,18 +19,7 @@ OBJS = \
  CEvent.o
 
 LIBRARY = libcore.a
-STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation
-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../Servers -I.. -I.
-
-DEFINES = -DUSERLAND -DSANITIZE_PTRS -DLIBGUI
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-ld
-AR = i686-pc-serenity-ar
+DEFINES += -DUSERLAND
 
 all: $(LIBRARY)
 

diff --git a/LibGUI/Makefile b/LibGUI/Makefile
@@ -1,3 +1,5 @@
+include ../Makefile.common
+
 SHAREDGRAPHICS_OBJS = \
  ../SharedGraphics/Painter.o \
  ../SharedGraphics/StylePainter.o \
@@ -55,18 +57,7 @@ LIBGUI_OBJS = \
 OBJS = $(SHAREDGRAPHICS_OBJS) $(LIBGUI_OBJS)
 
 LIBRARY = libgui.a
-STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation
-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../Servers -I.. -I.
-
-DEFINES = -DUSERLAND -DSANITIZE_PTRS -DLIBGUI
-
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = i686-pc-serenity-g++
-LD = i686-pc-serenity-ld
-AR = i686-pc-serenity-ar
+DEFINES += -DUSERLAND
 
 all: $(LIBRARY)