Rev 3369 | Rev 3438 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3369 | Rev 3410 | ||
|---|---|---|---|
| Line 94... | Line 94... | ||
| 94 | endif |
94 | endif |
| 95 | ifeq ($(RDFMT),fat) |
95 | ifeq ($(RDFMT),fat) |
| 96 | COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat |
96 | COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat |
| 97 | endif |
97 | endif |
| 98 | 98 | ||
| 99 | RD_TASKS = \ |
99 | RD_SRVS = \ |
| 100 | $(USPACEDIR)/srv/fb/fb \ |
100 | $(USPACEDIR)/srv/fb/fb \ |
| 101 | $(USPACEDIR)/srv/kbd/kbd \ |
101 | $(USPACEDIR)/srv/kbd/kbd \ |
| 102 | $(USPACEDIR)/srv/console/console \ |
102 | $(USPACEDIR)/srv/console/console \ |
| 103 | $(USPACEDIR)/srv/fs/tmpfs/tmpfs \ |
103 | $(USPACEDIR)/srv/fs/tmpfs/tmpfs \ |
| 104 | $(USPACEDIR)/srv/fs/fat/fat \ |
104 | $(USPACEDIR)/srv/fs/fat/fat |
| - | 105 | ||
| - | 106 | RD_APPS = \ |
|
| 105 | $(USPACEDIR)/app/tetris/tetris \ |
107 | $(USPACEDIR)/app/tetris/tetris \ |
| 106 | $(USPACEDIR)/app/tester/tester \ |
108 | $(USPACEDIR)/app/tester/tester \ |
| 107 | $(USPACEDIR)/app/bdsh/bdsh \ |
109 | $(USPACEDIR)/app/bdsh/bdsh \ |
| 108 | $(USPACEDIR)/app/klog/klog |
110 | $(USPACEDIR)/app/klog/klog |
| 109 | 111 | ||
| 110 | - | ||
| 111 | OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) |
112 | OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) |
| 112 | COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS)))) |
113 | COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS)))) |
| 113 | 114 | ||
| 114 | .PHONY: all clean depend |
115 | .PHONY: all clean depend |
| 115 | 116 | ||
| Line 122... | Line 123... | ||
| 122 | 123 | ||
| 123 | depend: |
124 | depend: |
| 124 | -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null |
125 | -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null |
| 125 | 126 | ||
| 126 | clean: |
127 | clean: |
| - | 128 | -for file in $(RD_SRVS) ; do \ |
|
| - | 129 | rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ |
|
| - | 130 | done |
|
| 127 | -for task in $(RD_TASKS) ; do \ |
131 | -for file in $(RD_APPS) ; do \ |
| 128 | rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \ |
132 | rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ |
| 129 | done |
133 | done |
| 130 | -rm -f _components.h _components.c _link.ld _link.ld.in $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend |
134 | -rm -f _components.h _components.c _link.ld _link.ld.in $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend |
| 131 | 135 | ||
| 132 | _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) _link.ld.in |
136 | _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in |
| - | 137 | for file in $(RD_SRVS) ; do \ |
|
| - | 138 | cp $$file $(USPACEDIR)/dist/srv/ ; \ |
|
| - | 139 | done |
|
| 133 | for task in $(RD_TASKS) ; do \ |
140 | for file in $(RD_APPS) ; do \ |
| 134 | cp $$task $(USPACEDIR)/dist/sbin/ ; \ |
141 | cp $$file $(USPACEDIR)/dist/app/ ; \ |
| 135 | done |
142 | done |
| 136 | ifeq ($(RDFMT),tmpfs) |
143 | ifeq ($(RDFMT),tmpfs) |
| 137 | ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs |
144 | ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs |
| 138 | endif |
145 | endif |
| 139 | ifeq ($(RDFMT),fat) |
146 | ifeq ($(RDFMT),fat) |