aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile12
-rw-r--r--build.mk8
2 files changed, 10 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index b068faa..cec32a8 100644
--- a/Makefile
+++ b/Makefile
@@ -16,14 +16,14 @@ SERVERS = mds mds-respawn mds-server mds-echo mds-registry
-OBJ_mds-server = mds-server interception-condition client multicast \
- queued-interception globals signals interceptors \
- sending slavery reexec receiving
+OBJ_mds-server_ = mds-server interception-condition client multicast \
+ queued-interception globals signals interceptors \
+ sending slavery reexec receiving
-OBJ_mds-registry = mds-registry
+OBJ_mds-registry_ = mds-registry
-OBJ_mds-server_ = $(foreach O,$(OBJ_mds-server),obj/mds-server/$(O).o)
-OBJ_mds-registry_ = $(foreach O,$(OBJ_mds-registry),obj/mds-registry/$(O).o)
+OBJ_mds-server = $(foreach O,$(OBJ_mds-server_),obj/mds-server/$(O).o)
+OBJ_mds-registry = $(foreach O,$(OBJ_mds-registry_),obj/mds-registry/$(O).o)
diff --git a/build.mk b/build.mk
index 200b9a0..e8bbd0e 100644
--- a/build.mk
+++ b/build.mk
@@ -13,18 +13,18 @@ servers: $(foreach S,$(SERVERS),bin/$(S))
# Link large servers.
-bin/mds-server: $(OBJ_mds-server_) obj/mds-base.o bin/libmdsserver.so
+bin/mds-server: $(OBJ_mds-server) obj/mds-base.o bin/libmdsserver.so
mkdir -p $(shell dirname $@)
- $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds-server) $(OBJ_mds-server_) obj/mds-base.o
+ $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds-server) $(OBJ_mds-server) obj/mds-base.o
ifeq ($(DEBUG),y)
mv $@ $@.real
cp test.d/mds-server $@
endif
-bin/mds-registry: $(OBJ_mds-registry_) obj/mds-base.o bin/libmdsserver.so
+bin/mds-registry: $(OBJ_mds-registry) obj/mds-base.o bin/libmdsserver.so
mkdir -p $(shell dirname $@)
- $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds-registry) $(OBJ_mds-registry_) obj/mds-base.o
+ $(CC) $(C_FLAGS) -o $@ $(LDS) $(LDS_mds-registry) $(OBJ_mds-registry) obj/mds-base.o
# Link small servers.