X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=Makefile.in;fp=Makefile.in;h=8ecc1b8f6d606497aff2e9291e9b962d698cd28e;hb=32e646780461f96682d1191d31e08e4602ab125e;hp=d7640b6c3782cfb577b0067230b7b8cc9565021a;hpb=54cf5827521ddf1d4be9bed2da196ca58e773e4e;p=paraslash.git

diff --git a/Makefile.in b/Makefile.in
index d7640b6c..8ecc1b8f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,10 +15,15 @@ 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 := deterministic entropy
+codename := infinite rollback
+
+GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
+DEBUG_CPPFLAGS += -Wall
+DEBUG_CPPFLAGS += -Wformat-security
+DEBUG_CPPFLAGS += -Wmissing-format-attribute
 # produces false positives
 # DEBUG_CPPFLAGS += -Wunreachable-code
 # DEBUG_CPPFLAGS += -Wwrite-strings
@@ -38,28 +43,23 @@ ifeq ($(uname_s),Linux)
 	CPPFLAGS += -Wshadow
 endif
 CPPFLAGS += -Os
-CPPFLAGS += -Wall
 CPPFLAGS += -Wuninitialized
 CPPFLAGS += -Wchar-subscripts
-CPPFLAGS += -Wformat-security
 CPPFLAGS += -DBINDIR='"$(BINDIR)"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
 CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
 CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
-CPPFLAGS += -Wmissing-format-attribute
 CPPFLAGS += -Wmissing-noreturn
 CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wbad-function-cast
 CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
-CPPFLAGS += @ncurses_cppflags@
 CPPFLAGS += @arch_cppflags@
 CPPFLAGS += -I/usr/local/include
 CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += @osl_cppflags@
-CPPFLAGS += -DGIT_VERSION='"$(GIT_VERSION)"'
 
 man_pages := $(patsubst %, man/man1/%.1, @executables@)
 man_pages_in := $(patsubst %, web/%.man.in.html, @executables@)
@@ -100,18 +100,12 @@ else
 	Q =
 endif
 
-.PHONY: dep all clean distclean maintainer-clean install man tarball\
-	.FORCE-GIT-VERSION-FILE
+.PHONY: dep all clean distclean maintainer-clean install man tarball
 all: dep @executables@ $(man_pages)
 dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-	@./GIT-VERSION-GEN GIT-VERSION-FILE
--include GIT-VERSION-FILE
-@executables@: GIT-VERSION-FILE
-
 -include $(ggo_dir)/makefile
 
 %_command_list.c: %.cmd
@@ -198,6 +192,10 @@ $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
+$(object_dir)/gui%.o: gui%.c | $(object_dir)
+	@[ -z "$(Q)" ] || echo 'CC $<'
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @curses_cppflags@ $<
+
 $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c $(CPPFLAGS) -Wno-unused-function -o $@ $<
@@ -214,6 +212,7 @@ $(object_dir)/%.d: %.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'DEP $<'
 	$(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@
 
+
 recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
 filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
 client_objs := $(addprefix $(object_dir)/, @client_objs@)
@@ -249,7 +248,7 @@ para_client: $(client_objs)
 
 para_gui: $(gui_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lncurses
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lcurses
 
 para_audiod: audiod_command_list.c audiod_command_list.h $(audiod_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
@@ -307,7 +306,7 @@ $(tarball): $(cmdline_generated)
 	git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
 	mkdir -p $(tarball_pfx)/$(cmdline_dir)
-	echo $(GIT_VERSION) > $(tarball_pfx)/VERSION
+	./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
 	cp -r $(autocrap) $(tarball_pfx)
 	cp -r $(cmdline_generated) $(tarball_pfx)/$(cmdline_dir)
 	tar rf $(tarball_pfx).tar $(tarball_pfx)/*