X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=94d8edf287c67f57b33cd90482dd1625ecfb2a64;hp=55d9e18c4c2a4f216767393510c84b447efff6b4;hb=2975726ce97716b97565b065b725f979dad92a88;hpb=5597f7555575ba0cf1955b102403f04fa1115c10 diff --git a/Makefile.real b/Makefile.real index 55d9e18c..94d8edf2 100644 --- a/Makefile.real +++ b/Makefile.real @@ -1,5 +1,5 @@ -VARDIR := /var/paraslash -MANDIR := $(datarootdir)/man/man1 +vardir := /var/paraslash +mandir := $(datarootdir)/man/man1 STRIP := $(CROSS_COMPILE)strip HOSTCC ?= cc MKDIR_P := mkdir -p @@ -81,10 +81,10 @@ $(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,\ $(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,\ $(subst z,Z,$1)))))))))))))))))))))))))) -CPPFLAGS += -DBINDIR='"$(BINDIR)"' -CPPFLAGS += -DBUILD_DATE='"$(build_date)"' -CPPFLAGS += -DUNAME_RS='"$(uname_rs)"' -CPPFLAGS += -DCC_VERSION='"$(cc_version)"' +CPPFLAGS += -DBINDIR='"$(bindir)"' +CPPFLAGS += -DBUILD_DATE='"$(shell date)"' +CPPFLAGS += -DUNAME_RS='"$(shell uname -rs)"' +CPPFLAGS += -DCC_VERSION='"$(shell $(CC) --version | head -n 1)"' CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F) CPPFLAGS += $(arch_cppflags) CPPFLAGS += -I/usr/local/include @@ -110,6 +110,7 @@ LDFLAGS += $(clock_gettime_ldflags) ifeq ($(uname_s),Linux) # these cause warnings on *BSD + CPPFLAGS += -Wunused-macros STRICT_CFLAGS += -fdata-sections -ffunction-sections STRICT_CFLAGS += -Wstrict-prototypes STRICT_CFLAGS += -Wshadow @@ -131,7 +132,7 @@ $(cmdlist_dir)/%.command_list.h: %.cmd %.c | $(cmdlist_dir) $(cmdlist_dir)/%.command_list.man: %.cmd %.c | $(cmdlist_dir) @[ -z "$(Q)" ] || echo 'GEN $@' $(Q) ./command_util.bash man < $< > $@ -$(cmdlist_dir)/%.completion.h: %.cmd %.c | $(cmdlist_dir) +$(cmdlist_dir)/%.completion.h: %.cmd | $(cmdlist_dir) @[ -z "$(Q)" ] || echo 'GEN $@' $(Q) ./command_util.bash compl $(strip $(call TOUPPER,$(*F)))_COMPLETERS \ $(strip $(call TOUPPER,$(*F)))_COMMANDS < $< > $@ @@ -146,9 +147,9 @@ $(cmdlist_dir)/afs.command_list.man \ $(cmdlist_dir)/afs.completion.h \ : afs.c aft.c attribute.c -$(cmdlist_dir)/audiod,command_list.h \ -$(cmdlist_dir)/audiod,command_list.man \ -$(cmdlist_dir)/audiod,completion.h \ +$(cmdlist_dir)/audiod.command_list.h \ +$(cmdlist_dir)/audiod.command_list.man \ +$(cmdlist_dir)/audiod.completion.h \ : audiod_command.c server_command_lists := $(cmdlist_dir)/server.command_list.man \ @@ -196,6 +197,8 @@ $(object_dir)/flac%.o $(dep_dir)/flac%.d: CPPFLAGS += $(flac_cppflags) $(object_dir)/mp3_afh.o $(dep_dir)/mp3_afh.d: CPPFLAGS += $(id3tag_cppflags) $(object_dir)/crypt.o $(dep_dir)/crypt.d: CPPFLAGS += $(openssl_cppflags) $(object_dir)/gcrypt.o $(dep_dir)/gcrypt.d: CPPFLAGS += $(gcrypt_cppflags) +$(object_dir)/ao_write.o $(dep_dir)/ao_write.d: CPPFLAGS += $(ao_cppflags) +$(object_dir)/aac_afh.o $(dep_dir)/aac_afh.d: CPPFLAGS += $(mp4v2_cppflags) $(object_dir)/alsa%.o $(dep_dir)/alsa%.d: CPPFLAGS += $(alsa_cppflags) $(object_dir)/interactive.o $(dep_dir)/interactive.d \ @@ -204,6 +207,9 @@ $(object_dir)/interactive.o $(dep_dir)/interactive.d \ $(object_dir)/resample_filter.o $(dep_dir)/resample_filter.d \ : CPPFLAGS += $(samplerate_cppflags) +$(object_dir)/oss_write.o $(dep_dir)/oss_write.d \ +: CPPFLAGS += $(oss_cppflags) + $(object_dir)/ao_write.o $(dep_dir)/ao_write.d \ : CPPFLAGS += $(ao_cppflags) $(pthread_cppflags) @@ -283,6 +289,7 @@ para_filter \ para_play \ : LDFLAGS += \ $(mad_ldflags) \ + $(faad_ldflags) \ $(samplerate_ldflags) \ -lm @@ -308,6 +315,13 @@ para_recv \ $(faad_ldflags) \ $(flac_ldflags) +para_server \ +para_play \ +para_afh \ +para_recv \ +: LDFLAGS += \ + $(mp4v2_ldflags) + para_server \ para_client \ para_audioc \ @@ -316,6 +330,8 @@ para_recv \ : LDFLAGS += \ $(socket_ldflags) $(nsl_ldflags) +para_afh para_recv para_server para_play: LDFLAGS += $(iconv_ldflags) + $(foreach exe,$(executables),$(eval para_$(exe): $$($(exe)_objs))) $(prefixed_executables): @[ -z "$(Q)" ] || echo 'LD $@' @@ -337,14 +353,13 @@ distclean: clean2 test-clean maintainer-clean: distclean @[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN' $(Q) rm -f *.tar.bz2 config.h configure config.h.in - $(Q) rm -rf web_sync install: all man - $(MKDIR_P) $(BINDIR) $(MANDIR) + $(MKDIR_P) $(bindir) $(mandir) $(INSTALL) -s --strip-program $(STRIP) -m 755 \ - $(prefixed_executables) $(BINDIR) - $(INSTALL) -m 644 $(man_pages) $(MANDIR) - $(MKDIR_P) $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain + $(prefixed_executables) $(bindir) + $(INSTALL) -m 644 $(man_pages) $(mandir) + $(MKDIR_P) $(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain $(tarball): $(Q) rm -rf $(tarball) $(tarball_pfx)