diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-12-20 20:03:22 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-12-20 20:03:22 +0100 |
| commit | 09353da6e91a0968ae24d4b4d97ed434520e6217 (patch) | |
| tree | 016694d12e9dfebc773cef629eb56556d0024b22 /Source/Applications/Shell/Makefile | |
| parent | 247070cc7e5ae117fd0d1b551fafdf5c13f0dd6b (diff) | |
| parent | 18454dc8be12827a84c2ebc58aa5d31bb44e1e6a (diff) | |
| download | Melon-09353da6e91a0968ae24d4b4d97ed434520e6217.tar.gz Melon-09353da6e91a0968ae24d4b4d97ed434520e6217.zip | |
Merge branch 'framework'
Conflicts:
.gitignore
Diffstat (limited to 'Source/Applications/Shell/Makefile')
| -rw-r--r-- | Source/Applications/Shell/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/Applications/Shell/Makefile b/Source/Applications/Shell/Makefile index d546a15..e972dfb 100644 --- a/Source/Applications/Shell/Makefile +++ b/Source/Applications/Shell/Makefile @@ -10,7 +10,9 @@ Objects = Shell.class.o \ Shell-fs.class.o OutFile = Shell -all: $(OutFile) +Applets = Applets/rot13 + +all: $(OutFile) $(Applets) echo "* Done with $(OutFile)." rebuild: mrproper all @@ -19,6 +21,10 @@ $(OutFile): $(Objects) echo "* Linking $@..." $(LD) $(LDFLAGS) $^ -o $@ +Applets/%: Applets/%.o + echo "* Linking $@..." + $(LD) $(LDFLAGS) $^ -o $@ -Map $@.map + %.o: %.cpp echo "* Compiling $<..." $(CXX) $(CXXFLAGS) -c $< -o $@ |