diff options
| author | Lawrence Manning <lawrence@aslak.net> | 2019-06-25 10:17:26 +0100 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2019-06-25 21:35:50 +0200 |
| commit | f0a6b42066a2560c6fa6171bc4706b8815e32a58 (patch) | |
| tree | 2ff98d0020a0a70c20fa2016751a0be336429f16 | |
| parent | 8247dad54001d62dda1bf06e1086c18e59eaec79 (diff) | |
| download | serenity-f0a6b42066a2560c6fa6171bc4706b8815e32a58.zip | |
Move common Application build steps into their own Makefile.common
Further consolidation is of course possible, eg the Games/ programs
follow the same rules more or less.
| -rwxr-xr-x[-rw-r--r--] | Applications/About/Makefile | 16 | ||||
| -rw-r--r-- | Applications/Downloader/Makefile | 16 | ||||
| -rw-r--r-- | Applications/FileManager/Makefile | 16 | ||||
| -rw-r--r-- | Applications/FontEditor/Makefile | 16 | ||||
| -rw-r--r-- | Applications/IRCClient/Makefile | 16 | ||||
| -rw-r--r-- | Applications/Launcher/Makefile | 16 | ||||
| -rwxr-xr-x | Applications/Makefile.common | 14 | ||||
| -rw-r--r-- | Applications/PaintBrush/Makefile | 16 | ||||
| -rw-r--r-- | Applications/ProcessManager/Makefile | 16 | ||||
| -rw-r--r-- | Applications/QuickShow/Makefile | 16 | ||||
| -rw-r--r-- | Applications/Taskbar/Makefile | 16 | ||||
| -rw-r--r-- | Applications/Terminal/Makefile | 16 | ||||
| -rwxr-xr-x[-rw-r--r--] | Applications/TextEditor/Makefile | 16 |
13 files changed, 26 insertions, 180 deletions
diff --git a/Applications/About/Makefile b/Applications/About/Makefile index c9ab2bf262..123a3b9392 100644..100755 --- a/Applications/About/Makefile +++ b/Applications/About/Makefile @@ -5,18 +5,4 @@ OBJS = \ APP = About -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common diff --git a/Applications/Downloader/Makefile b/Applications/Downloader/Makefile index 089261a6f2..ed218f20a9 100644 --- a/Applications/Downloader/Makefile +++ b/Applications/Downloader/Makefile @@ -5,18 +5,4 @@ OBJS = \ APP = Downloader -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common
\ No newline at end of file diff --git a/Applications/FileManager/Makefile b/Applications/FileManager/Makefile index d915d82c36..3585e597d6 100644 --- a/Applications/FileManager/Makefile +++ b/Applications/FileManager/Makefile @@ -6,18 +6,4 @@ OBJS = \ APP = FileManager -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common diff --git a/Applications/FontEditor/Makefile b/Applications/FontEditor/Makefile index 08817ae0bb..de4875e813 100644 --- a/Applications/FontEditor/Makefile +++ b/Applications/FontEditor/Makefile @@ -8,18 +8,4 @@ OBJS = \ APP = FontEditor -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common diff --git a/Applications/IRCClient/Makefile b/Applications/IRCClient/Makefile index 8fdecb0170..fef4865cca 100644 --- a/Applications/IRCClient/Makefile +++ b/Applications/IRCClient/Makefile @@ -14,18 +14,4 @@ OBJS = \ APP = IRCClient -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common diff --git a/Applications/Launcher/Makefile b/Applications/Launcher/Makefile index 9a5aac070a..58d00627ee 100644 --- a/Applications/Launcher/Makefile +++ b/Applications/Launcher/Makefile @@ -5,18 +5,4 @@ OBJS = \ APP = Launcher -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common diff --git a/Applications/Makefile.common b/Applications/Makefile.common new file mode 100755 index 0000000000..6e36e0b8c5 --- /dev/null +++ b/Applications/Makefile.common @@ -0,0 +1,14 @@ +DEFINES += -DUSERLAND + +all: $(APP) + +$(APP): $(OBJS) + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc + +.cpp.o: + @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< + +-include $(OBJS:%.o=%.d) + +clean: + @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d diff --git a/Applications/PaintBrush/Makefile b/Applications/PaintBrush/Makefile index 4c4b5e20f2..c9ec8b39ca 100644 --- a/Applications/PaintBrush/Makefile +++ b/Applications/PaintBrush/Makefile @@ -14,18 +14,4 @@ OBJS = \ APP = PaintBrush -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common diff --git a/Applications/ProcessManager/Makefile b/Applications/ProcessManager/Makefile index 2594946209..e5456fd82a 100644 --- a/Applications/ProcessManager/Makefile +++ b/Applications/ProcessManager/Makefile @@ -9,18 +9,4 @@ OBJS = \ APP = ProcessManager -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common diff --git a/Applications/QuickShow/Makefile b/Applications/QuickShow/Makefile index 8fce186807..7e03212941 100644 --- a/Applications/QuickShow/Makefile +++ b/Applications/QuickShow/Makefile @@ -6,18 +6,4 @@ OBJS = \ APP = QuickShow -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common diff --git a/Applications/Taskbar/Makefile b/Applications/Taskbar/Makefile index 866711fe40..04cc970041 100644 --- a/Applications/Taskbar/Makefile +++ b/Applications/Taskbar/Makefile @@ -8,18 +8,4 @@ OBJS = \ APP = Taskbar -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common diff --git a/Applications/Terminal/Makefile b/Applications/Terminal/Makefile index 4d0e7ce471..baa5eb2148 100644 --- a/Applications/Terminal/Makefile +++ b/Applications/Terminal/Makefile @@ -6,18 +6,4 @@ OBJS = \ APP = Terminal -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common diff --git a/Applications/TextEditor/Makefile b/Applications/TextEditor/Makefile index a649e02bdf..c1d774f9ea 100644..100755 --- a/Applications/TextEditor/Makefile +++ b/Applications/TextEditor/Makefile @@ -5,18 +5,4 @@ OBJS = \ APP = TextEditor -DEFINES += -DUSERLAND - -all: $(APP) - -$(APP): $(OBJS) - $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc - -.cpp.o: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< - --include $(OBJS:%.o=%.d) - -clean: - @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d - +include ../Makefile.common |