Rev 3397 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3397 | Rev 3492 | ||
---|---|---|---|
Line 55... | Line 55... | ||
55 | LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld |
55 | LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld |
56 | OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy |
56 | OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy |
57 | OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump |
57 | OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump |
58 | endif |
58 | endif |
59 | 59 | ||
60 | CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../.. -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 |
60 | CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../.. -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -pipe |
61 | 61 | ||
62 | ifdef REVISION |
62 | ifdef REVISION |
63 | CFLAGS += "-DREVISION=\"$(REVISION)\"" |
63 | CFLAGS += "-DREVISION=\"$(REVISION)\"" |
64 | endif |
64 | endif |
65 | 65 | ||
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 \ |
- | 109 | $(USPACEDIR)/app/trace/trace \ |
|
107 | $(USPACEDIR)/app/klog/klog \ |
110 | $(USPACEDIR)/app/klog/klog \ |
108 | $(USPACEDIR)/app/bdsh/bdsh |
111 | $(USPACEDIR)/app/bdsh/bdsh |
109 | 112 | ||
110 | OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) |
113 | OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) |
111 | COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS)))) |
114 | COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS)))) |
Line 118... | Line 121... | ||
118 | 121 | ||
119 | image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) |
122 | image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) |
120 | $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@ |
123 | $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@ |
121 | 124 | ||
122 | depend: |
125 | depend: |
123 | -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null |
126 | -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null |
124 | 127 | ||
125 | clean: |
128 | clean: |
- | 129 | -for file in $(RD_SRVS) ; do \ |
|
- | 130 | rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ |
|
- | 131 | done |
|
126 | -for task in $(RD_TASKS) ; do \ |
132 | -for file in $(RD_APPS) ; do \ |
127 | rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \ |
133 | rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ |
128 | done |
134 | done |
129 | -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend |
135 | -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend |
130 | 136 | ||
131 | _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) _link.ld.in |
137 | _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in |
- | 138 | for file in $(RD_SRVS) ; do \ |
|
- | 139 | cp $$file $(USPACEDIR)/dist/srv/ ; \ |
|
- | 140 | done |
|
132 | for task in $(RD_TASKS) ; do \ |
141 | for file in $(RD_APPS) ; do \ |
133 | cp $$task $(USPACEDIR)/dist/sbin/ ; \ |
142 | cp $$file $(USPACEDIR)/dist/app/ ; \ |
134 | done |
143 | done |
135 | ifeq ($(RDFMT),tmpfs) |
144 | ifeq ($(RDFMT),tmpfs) |
136 | ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs |
145 | ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs |
137 | endif |
146 | endif |
138 | ifeq ($(RDFMT),fat) |
147 | ifeq ($(RDFMT),fat) |