Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Build: clean up build system, use one shared Makefile
Allow everything to be built from the top level directory with just 'make', cleaned with 'make clean', and installed with 'make install'. Also support these in any particular subdirectory. Specifying 'make VERBOSE=1' will print each ld/g++/etc. command as it runs. Kernel and early host tools (IPCCompiler, etc.) are built as object.host.o so that they don't conflict with other things built with the cross-compiler.
- Loading branch information
1 parent
f4b2b72
commit ac25438
Showing
92 changed files
with
518 additions
and
920 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| install: | ||
| mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/AK/ | ||
| cp ../AK/*.h $(SERENITY_BASE_DIR)/Root/usr/include/AK/ | ||
|
|
||
| include ../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| main.o | ||
|
|
||
| APP = About | ||
| PROGRAM = About | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lipc -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| main.o | ||
|
|
||
| APP = Browser | ||
| PROGRAM = Browser | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -lhtml -ldraw -lprotocol -lipc -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| Calculator.o \ | ||
| Keypad.o \ | ||
| CalculatorWidget.o \ | ||
| main.o | ||
| Calculator.o \ | ||
| Keypad.o \ | ||
| CalculatorWidget.o \ | ||
| main.o | ||
|
|
||
| APP = Calculator | ||
| PROGRAM = Calculator | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lipc -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| ThreadCatalogModel.o \ | ||
| BoardListModel.o \ | ||
| main.o | ||
|
|
||
| APP = ChanViewer | ||
| PROGRAM = ChanViewer | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lipc -lthread -lpthread -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| DisplayProperties.o \ | ||
| main.o \ | ||
|
|
||
| APP = DisplayProperties | ||
| PROGRAM = DisplayProperties | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lipc -lthread -lpthread -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| DirectoryView.o \ | ||
| FileUtils.o \ | ||
| PropertiesDialog.o \ | ||
| PropertiesDialog.o \ | ||
| main.o | ||
|
|
||
| APP = FileManager | ||
| PROGRAM = FileManager | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lipc -lthread -lpthread -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,18 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| FontEditor.o \ | ||
| GlyphMapWidget.o \ | ||
| GlyphEditorWidget.o \ | ||
| main.o | ||
|
|
||
| APP = FontEditor | ||
| PROGRAM = FontEditor | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lipc -lcore -lc | ||
|
|
||
| FontEditor.cpp: UI_FontEditorBottom.h | ||
|
|
||
| UI_FontEditorBottom.h: FontEditorBottom.frm | ||
| ../../DevTools/FormCompiler/FormCompiler $< > $@ | ||
|
|
||
| EXTRA_CLEAN = UI_FontEditorBottom.h | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| ManualModel.o \ | ||
| ManualSectionNode.o \ | ||
| ManualPageNode.o \ | ||
| History.o \ | ||
| main.o | ||
|
|
||
| APP = Help | ||
| PROGRAM = Help | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -lhtml -lmarkdown -ldraw -lipc -lprotocol -lthread -lpthread -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| HexEditor.o \ | ||
| HexEditor.o \ | ||
| HexEditorWidget.o \ | ||
| main.o | ||
| main.o | ||
|
|
||
| APP = HexEditor | ||
| PROGRAM = HexEditor | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lipc -lthread -lpthread -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SUBDIRS := $(wildcard */.) | ||
|
|
||
| include ../Makefile.subdir |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| PianoWidget.o \ | ||
| main.o | ||
|
|
||
| APP = Piano | ||
| PROGRAM = Piano | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -laudio -lipc -lthread -lpthread -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| QSWidget.o \ | ||
| main.o | ||
|
|
||
| APP = QuickShow | ||
| PROGRAM = QuickShow | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lprotocol -lipc -lthread -lpthread -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| PlaybackManager.o \ | ||
| PlaybackManager.o \ | ||
| SampleWidget.o \ | ||
| SoundPlayerWidget.o \ | ||
| SoundPlayerWidget.o \ | ||
| main.o | ||
|
|
||
| APP = SoundPlayer | ||
| PROGRAM = SoundPlayer | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -laudio -lipc -lthread -lpthread -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| main.o | ||
|
|
||
| APP = SystemDialog | ||
| PROGRAM = SystemDialog | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lipc -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| TaskbarWindow.o \ | ||
| TaskbarButton.o \ | ||
| WindowList.o \ | ||
| main.o | ||
|
|
||
| APP = Taskbar | ||
| PROGRAM = Taskbar | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lipc -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| main.o | ||
|
|
||
| APP = Terminal | ||
| PROGRAM = Terminal | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lvt -lprotocol -lipc -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| TextEditorWidget.o \ | ||
| main.o | ||
| main.o | ||
|
|
||
| APP = TextEditor | ||
| PROGRAM = TextEditor | ||
|
|
||
| include ../Makefile.common | ||
| LDFLAGS = -lgui -ldraw -lvt -lipc -lthread -lpthread -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| main.o \ | ||
| TextWidget.o \ | ||
| background.png.o | ||
|
|
||
| APP = Welcome | ||
| PROGRAM = Welcome | ||
|
|
||
| LDFLAGS = -lgui -ldraw -lipc -lcore -lc | ||
|
|
||
| .SUFFIXES: .png | ||
| %.png.o: %.png | ||
| @echo "LINK $<"; $(LINK) --relocatable --format binary --output $@ $< | ||
|
|
||
| include ../Makefile.common | ||
| include ../../Makefile.common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,8 @@ | ||
| include ../../Makefile.common | ||
|
|
||
| OBJS = \ | ||
| Fire.o | ||
|
|
||
| APP = Fire | ||
|
|
||
| DEFINES += -DUSERLAND | ||
|
|
||
| all: $(APP) | ||
| PROGRAM = Fire | ||
|
|
||
| $(APP): $(OBJS) | ||
| $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lipc -lcore -lc | ||
|
|
||
| .cpp.o: | ||
| @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< | ||
|
|
||
| -include $(OBJS:%.o=%.d) | ||
|
|
||
| clean: | ||
| @echo "CLEAN"; rm -f $(APP) $(OBJS) *.d | ||
| LDFLAGS = -lgui -ldraw -lipc -lcore -lc | ||
|
|
||
| include ../../Makefile.common |
Oops, something went wrong.