X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=9d10e184d74876cc76b655ac2a9a58bcb080a9ad;hp=464cd68ee2a1af044d0b09e36f4681db2a836aae;hb=21c6e0b09b42e61e72b741bd726856ab0bcd1d64;hpb=c6a123a4bfdce6c278ece9d368ad94c33db567da diff --git a/Makefile.real b/Makefile.real index 464cd68e..9d10e184 100644 --- a/Makefile.real +++ b/Makefile.real @@ -10,7 +10,6 @@ endif vardir := /var/paraslash mandir := $(datarootdir)/man/man1 STRIP := $(CROSS_COMPILE)strip -HOSTCC ?= cc MKDIR_P := mkdir -p prefixed_executables := $(addprefix para_, $(executables)) @@ -34,7 +33,6 @@ cmdline_dir := $(build_dir)/cmdline cmdlist_dir := $(build_dir)/cmdlist m4depdir := $(build_dir)/m4deps help2man_dir := $(build_dir)/help2man -hostbin_dir := $(build_dir)/host/bin m4_ggo_dir := m4/gengetopt test_dir := t @@ -78,7 +76,7 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),) endif $(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \ - $(help2man_dir) $(hostbin_dir) $(cmdlist_dir): + $(help2man_dir) $(cmdlist_dir): $(Q) $(MKDIR_P) $@ # When in doubt, use brute force (Ken Thompson) @@ -95,7 +93,6 @@ CPPFLAGS += -DCOPYRIGHT_YEAR='"$(COPYRIGHT_YEAR)"' CPPFLAGS += -DBUILD_DATE='"$(build_date)"' CPPFLAGS += -DUNAME_RS='"$(uname_rs)"' CPPFLAGS += -DCC_VERSION='"$(cc_version)"' -CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F) CPPFLAGS += -I/usr/local/include CPPFLAGS += -I$(cmdline_dir) CPPFLAGS += -I$(cmdlist_dir) @@ -197,13 +194,6 @@ $(man_dir)/para_%.1: $(ggo_dir)/%.ggo man_util.bash \ WRITERS="$(writers)" \ ./man_util.bash $@ -$(hostbin_dir)/error2: error2.c | $(hostbin_dir) - @[ -z "$(Q)" ] || echo 'HCC $<' - $(Q) $(HOSTCC) -o $@ $< -error2.h: $(hostbin_dir)/error2 config.h - @[ -z "$(Q)" ] || echo 'ER2 $<' - @echo "$(object_executable_matrix)" | $< > $@ - $(object_dir)/%.o: %.c | $(object_dir) $(object_dir)/opus%.o $(dep_dir)/opus%.d: CPPFLAGS += $(opus_cppflags) @@ -283,7 +273,7 @@ $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h # The compiler outputs dependencies either as foo.h or as some_directory/foo.h, # depending on whether the latter file exists. Since make needs the directory # part we prefix the dependency as appropriate. -$(dep_dir)/%.d: %.c error2.h | $(dep_dir) +$(dep_dir)/%.d: %.c | $(dep_dir) @[ -z "$(Q)" ] || echo 'DEP $<' $(Q) $(CC) $(CPPFLAGS) -MM -MG -MP -MT $@ -MT $(object_dir)/$(*F).o $< \ | sed -e "s@ \([a-zA-Z0-9_]\{1,\}\.cmdline.h\)@ $(cmdline_dir)/\1@g" \ @@ -357,7 +347,7 @@ clean2: clean $(Q) rm -rf $(build_dir) distclean: clean2 test-clean @[ -z "$(Q)" ] || echo 'DISTCLEAN' - $(Q) rm -f Makefile autoscan.log config.status config.log error2.h + $(Q) rm -f Makefile autoscan.log config.status config.log $(Q) rm -f GPATH GRTAGS GSYMS GTAGS maintainer-clean: distclean