aboutsummaryrefslogtreecommitdiffstats
path: root/mk
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-09-28 01:40:09 +0200
committerMattias Andrée <maandree@operamail.com>2014-09-28 01:40:09 +0200
commita36fde37f2adf1579a13707cd64a369683e35ca6 (patch)
tree9bd7d06ce25b5a8278d4e4ae9f6fbdcf39ef5006 /mk
parentcompose table: also assume we have the basic modifiers (diff)
downloadmds-a36fde37f2adf1579a13707cd64a369683e35ca6.tar.gz
mds-a36fde37f2adf1579a13707cd64a369683e35ca6.tar.bz2
mds-a36fde37f2adf1579a13707cd64a369683e35ca6.tar.xz
mds-kbdc will need multiple .c files + .h files are not required during linking
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk23
1 files changed, 12 insertions, 11 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 8e3ef62..d513a73 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -17,9 +17,9 @@ tools: $(foreach T,$(TOOLS),bin/$(T))
# Link large servers.
ifneq ($(LIBMDSSERVER_IS_INSTALLED),y)
-bin/mds-server: $(OBJ_mds-server) obj/mds-base.o src/mds-server/*.h bin/libmdsserver.so $(SEDED)
+bin/mds-server: $(OBJ_mds-server) obj/mds-base.o bin/libmdsserver.so
else
-bin/mds-server: $(OBJ_mds-server) obj/mds-base.o src/mds-server/*.h $(SEDED)
+bin/mds-server: $(OBJ_mds-server) obj/mds-base.o
endif
mkdir -p $(shell dirname $@)
$(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds-server) $(OBJ_mds-server) obj/mds-base.o
@@ -30,9 +30,9 @@ endif
ifneq ($(LIBMDSSERVER_IS_INSTALLED),y)
-bin/mds-registry: $(OBJ_mds-registry) obj/mds-base.o src/mds-registry/*.h bin/libmdsserver.so $(SEDED)
+bin/mds-registry: $(OBJ_mds-registry) obj/mds-base.o bin/libmdsserver.so
else
-bin/mds-registry: $(OBJ_mds-registry) obj/mds-base.o src/mds-registry/*.h $(SEDED)
+bin/mds-registry: $(OBJ_mds-registry) obj/mds-base.o
endif
mkdir -p $(shell dirname $@)
$(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds-registry) $(OBJ_mds-registry) obj/mds-base.o
@@ -41,9 +41,9 @@ endif
# Link small servers.
ifneq ($(LIBMDSSERVER_IS_INSTALLED),y)
-bin/%: obj/%.o obj/mds-base.o bin/libmdsserver.so $(SEDED)
+bin/%: obj/%.o obj/mds-base.o bin/libmdsserver.so
else
-bin/%: obj/%.o obj/mds-base.o $(SEDED)
+bin/%: obj/%.o obj/mds-base.o
endif
mkdir -p $(shell dirname $@)
$(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_$*) $< obj/mds-base.o
@@ -52,9 +52,9 @@ endif
# Link kernel.
ifneq ($(LIBMDSSERVER_IS_INSTALLED),y)
-bin/mds: obj/mds.o bin/libmdsserver.so $(SEDED)
+bin/mds: obj/mds.o bin/libmdsserver.so
else
-bin/mds: obj/mds.o $(SEDED)
+bin/mds: obj/mds.o
endif
mkdir -p $(shell dirname $@)
$(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds) $<
@@ -62,13 +62,14 @@ endif
# Link utilies that do not use mds-base.
+
ifneq ($(LIBMDSSERVER_IS_INSTALLED),y)
-bin/mds-kbdc: obj/mds-kbdc.o bin/libmdsserver.so $(SEDED)
+bin/mds-kbdc: $(OBJ_mds-kbdc) bin/libmdsserver.so
else
-bin/mds-kbdc: obj/mds-kbdc.o $(SEDED)
+bin/mds-kbdc: $(OBJ_mds-kbdc)
endif
mkdir -p $(shell dirname $@)
- $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds) $<
+ $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds-kbdc) $(OBJ_mds-kbdc)
# Build object files for kernel/servers.