X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=e4a3dd3f068f72bf2ff8655e5c8a482f87c68dc7;hp=a24ba6bae03256033d394119dec43e02550b6b7d;hb=ddbd317a575ed43fae187c9ff18c6d53ece76308;hpb=29a8e4384c08cb4e295e5b82994e62bf247a0ef7

diff --git a/Makefile.in b/Makefile.in
index a24ba6ba..e4a3dd3f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@ build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
-codename := concurrent eternalty
+codename := concurrent horizon
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -188,16 +188,13 @@ $(object_dir)/%.o: %.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
 
-# We depend on the *.cmdline.[ch] files as these must be present for depend.sh
-# to work. The first dependency is explititly given as it is used by $<.
-
-$(object_dir)/%.cmdline.d: %.cmdline.c $(cmdline_generated) | $(object_dir)
+$(object_dir)/%.cmdline.d: $(cmdline_dir)/%.cmdline.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'DEP $<'
-	$(Q) ./depend.sh $(object_dir) $(CPPFLAGS) $< > $@
+	$(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@
 
-$(object_dir)/%.d: %.c $(cmdline_generated) | $(object_dir)
+$(object_dir)/%.d: %.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'DEP $<'
-	$(Q) ./depend.sh  $(object_dir) $(CPPFLAGS) $< > $@
+	$(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@
 
 recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
 filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
@@ -211,7 +208,7 @@ write_objs := $(addprefix $(object_dir)/, @write_objs@)
 afh_objs := $(addprefix $(object_dir)/, @afh_objs@)
 
 all_objs := $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
-	$(audiod_objs ) $(audioc_objs) $(fade_objs) $(server_objs) \
+	$(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \
 	$(write_objs) $(afh_objs)
 -include $(all_objs:.o=.d)