From dc409c50e6e207a5ad1747d19cbafcf7856ba163 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Fri, 2 Nov 2012 12:45:29 +0200 Subject: build: Don't use make variables in the declaration of source files This is required for working dependency generation with the subdir-objects option enabled. --- Makefile.am | 253 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 122 insertions(+), 131 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 52e56ca..3c5e958 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,149 +41,140 @@ aac_enc_SOURCES = aac-enc.c wavreader.c noinst_HEADERS = wavreader.h endif -AACDEC_DIR = $(top_srcdir)/libAACdec/src AACDEC_SRC = \ - $(AACDEC_DIR)/aacdec_drc.cpp \ - $(AACDEC_DIR)/aacdec_hcr.cpp \ - $(AACDEC_DIR)/aacdecoder.cpp \ - $(AACDEC_DIR)/aacdec_pns.cpp \ - $(AACDEC_DIR)/aac_ram.cpp \ - $(AACDEC_DIR)/block.cpp \ - $(AACDEC_DIR)/channelinfo.cpp \ - $(AACDEC_DIR)/ldfiltbank.cpp \ - $(AACDEC_DIR)/rvlcbit.cpp \ - $(AACDEC_DIR)/rvlc.cpp \ - $(AACDEC_DIR)/aacdec_hcr_bit.cpp \ - $(AACDEC_DIR)/aacdec_hcrs.cpp \ - $(AACDEC_DIR)/aacdecoder_lib.cpp \ - $(AACDEC_DIR)/aacdec_tns.cpp \ - $(AACDEC_DIR)/aac_rom.cpp \ - $(AACDEC_DIR)/channel.cpp \ - $(AACDEC_DIR)/conceal.cpp \ - $(AACDEC_DIR)/pulsedata.cpp \ - $(AACDEC_DIR)/rvlcconceal.cpp \ - $(AACDEC_DIR)/stereo.cpp - -AACENC_DIR = $(top_srcdir)/libAACenc/src + libAACdec/src/aacdec_drc.cpp \ + libAACdec/src/aacdec_hcr.cpp \ + libAACdec/src/aacdecoder.cpp \ + libAACdec/src/aacdec_pns.cpp \ + libAACdec/src/aac_ram.cpp \ + libAACdec/src/block.cpp \ + libAACdec/src/channelinfo.cpp \ + libAACdec/src/ldfiltbank.cpp \ + libAACdec/src/rvlcbit.cpp \ + libAACdec/src/rvlc.cpp \ + libAACdec/src/aacdec_hcr_bit.cpp \ + libAACdec/src/aacdec_hcrs.cpp \ + libAACdec/src/aacdecoder_lib.cpp \ + libAACdec/src/aacdec_tns.cpp \ + libAACdec/src/aac_rom.cpp \ + libAACdec/src/channel.cpp \ + libAACdec/src/conceal.cpp \ + libAACdec/src/pulsedata.cpp \ + libAACdec/src/rvlcconceal.cpp \ + libAACdec/src/stereo.cpp + AACENC_SRC = \ - $(AACENC_DIR)/aacenc.cpp \ - $(AACENC_DIR)/aacEnc_ram.cpp \ - $(AACENC_DIR)/band_nrg.cpp \ - $(AACENC_DIR)/block_switch.cpp \ - $(AACENC_DIR)/grp_data.cpp \ - $(AACENC_DIR)/metadata_main.cpp \ - $(AACENC_DIR)/pre_echo_control.cpp \ - $(AACENC_DIR)/quantize.cpp \ - $(AACENC_DIR)/tonality.cpp \ - $(AACENC_DIR)/aacenc_hcr.cpp \ - $(AACENC_DIR)/aacEnc_rom.cpp \ - $(AACENC_DIR)/bandwidth.cpp \ - $(AACENC_DIR)/channel_map.cpp \ - $(AACENC_DIR)/intensity.cpp \ - $(AACENC_DIR)/ms_stereo.cpp \ - $(AACENC_DIR)/psy_configuration.cpp \ - $(AACENC_DIR)/sf_estim.cpp \ - $(AACENC_DIR)/transform.cpp \ - $(AACENC_DIR)/aacenc_lib.cpp \ - $(AACENC_DIR)/aacenc_tns.cpp \ - $(AACENC_DIR)/bit_cnt.cpp \ - $(AACENC_DIR)/chaosmeasure.cpp \ - $(AACENC_DIR)/line_pe.cpp \ - $(AACENC_DIR)/noisedet.cpp \ - $(AACENC_DIR)/psy_main.cpp \ - $(AACENC_DIR)/spreading.cpp \ - $(AACENC_DIR)/aacenc_pns.cpp \ - $(AACENC_DIR)/adj_thr.cpp \ - $(AACENC_DIR)/bitenc.cpp \ - $(AACENC_DIR)/dyn_bits.cpp \ - $(AACENC_DIR)/metadata_compressor.cpp \ - $(AACENC_DIR)/pnsparam.cpp \ - $(AACENC_DIR)/qc_main.cpp - -FDK_DIR = $(top_srcdir)/libFDK/src + libAACenc/src/aacenc.cpp \ + libAACenc/src/aacEnc_ram.cpp \ + libAACenc/src/band_nrg.cpp \ + libAACenc/src/block_switch.cpp \ + libAACenc/src/grp_data.cpp \ + libAACenc/src/metadata_main.cpp \ + libAACenc/src/pre_echo_control.cpp \ + libAACenc/src/quantize.cpp \ + libAACenc/src/tonality.cpp \ + libAACenc/src/aacenc_hcr.cpp \ + libAACenc/src/aacEnc_rom.cpp \ + libAACenc/src/bandwidth.cpp \ + libAACenc/src/channel_map.cpp \ + libAACenc/src/intensity.cpp \ + libAACenc/src/ms_stereo.cpp \ + libAACenc/src/psy_configuration.cpp \ + libAACenc/src/sf_estim.cpp \ + libAACenc/src/transform.cpp \ + libAACenc/src/aacenc_lib.cpp \ + libAACenc/src/aacenc_tns.cpp \ + libAACenc/src/bit_cnt.cpp \ + libAACenc/src/chaosmeasure.cpp \ + libAACenc/src/line_pe.cpp \ + libAACenc/src/noisedet.cpp \ + libAACenc/src/psy_main.cpp \ + libAACenc/src/spreading.cpp \ + libAACenc/src/aacenc_pns.cpp \ + libAACenc/src/adj_thr.cpp \ + libAACenc/src/bitenc.cpp \ + libAACenc/src/dyn_bits.cpp \ + libAACenc/src/metadata_compressor.cpp \ + libAACenc/src/pnsparam.cpp \ + libAACenc/src/qc_main.cpp + FDK_SRC = \ - $(FDK_DIR)/autocorr2nd.cpp \ - $(FDK_DIR)/dct.cpp \ - $(FDK_DIR)/FDK_bitbuffer.cpp \ - $(FDK_DIR)/FDK_core.cpp \ - $(FDK_DIR)/FDK_crc.cpp \ - $(FDK_DIR)/FDK_hybrid.cpp \ - $(FDK_DIR)/FDK_tools_rom.cpp \ - $(FDK_DIR)/FDK_trigFcts.cpp \ - $(FDK_DIR)/fft.cpp \ - $(FDK_DIR)/fft_rad2.cpp \ - $(FDK_DIR)/fixpoint_math.cpp \ - $(FDK_DIR)/mdct.cpp \ - $(FDK_DIR)/qmf.cpp \ - $(FDK_DIR)/scale.cpp - -MPEGTPDEC_DIR = $(top_srcdir)/libMpegTPDec/src + libFDK/src/autocorr2nd.cpp \ + libFDK/src/dct.cpp \ + libFDK/src/FDK_bitbuffer.cpp \ + libFDK/src/FDK_core.cpp \ + libFDK/src/FDK_crc.cpp \ + libFDK/src/FDK_hybrid.cpp \ + libFDK/src/FDK_tools_rom.cpp \ + libFDK/src/FDK_trigFcts.cpp \ + libFDK/src/fft.cpp \ + libFDK/src/fft_rad2.cpp \ + libFDK/src/fixpoint_math.cpp \ + libFDK/src/mdct.cpp \ + libFDK/src/qmf.cpp \ + libFDK/src/scale.cpp + MPEGTPDEC_SRC = \ - $(MPEGTPDEC_DIR)/tpdec_adif.cpp \ - $(MPEGTPDEC_DIR)/tpdec_adts.cpp \ - $(MPEGTPDEC_DIR)/tpdec_asc.cpp \ - $(MPEGTPDEC_DIR)/tpdec_latm.cpp \ - $(MPEGTPDEC_DIR)/tpdec_lib.cpp + libMpegTPDec/src/tpdec_adif.cpp \ + libMpegTPDec/src/tpdec_adts.cpp \ + libMpegTPDec/src/tpdec_asc.cpp \ + libMpegTPDec/src/tpdec_latm.cpp \ + libMpegTPDec/src/tpdec_lib.cpp -MPEGTPENC_DIR = $(top_srcdir)/libMpegTPEnc/src MPEGTPENC_SRC = \ - $(MPEGTPENC_DIR)/tpenc_adif.cpp \ - $(MPEGTPENC_DIR)/tpenc_adts.cpp \ - $(MPEGTPENC_DIR)/tpenc_asc.cpp \ - $(MPEGTPENC_DIR)/tpenc_latm.cpp \ - $(MPEGTPENC_DIR)/tpenc_lib.cpp + libMpegTPEnc/src/tpenc_adif.cpp \ + libMpegTPEnc/src/tpenc_adts.cpp \ + libMpegTPEnc/src/tpenc_asc.cpp \ + libMpegTPEnc/src/tpenc_latm.cpp \ + libMpegTPEnc/src/tpenc_lib.cpp -PCMUTILS_DIR = $(top_srcdir)/libPCMutils/src PCMUTILS_SRC = \ - $(PCMUTILS_DIR)/pcmutils_lib.cpp + libPCMutils/src/pcmutils_lib.cpp -SBRDEC_DIR = $(top_srcdir)/libSBRdec/src SBRDEC_SRC = \ - $(SBRDEC_DIR)/env_calc.cpp \ - $(SBRDEC_DIR)/env_dec.cpp \ - $(SBRDEC_DIR)/env_extr.cpp \ - $(SBRDEC_DIR)/huff_dec.cpp \ - $(SBRDEC_DIR)/lpp_tran.cpp \ - $(SBRDEC_DIR)/psbitdec.cpp \ - $(SBRDEC_DIR)/psdec.cpp \ - $(SBRDEC_DIR)/psdec_hybrid.cpp \ - $(SBRDEC_DIR)/sbr_crc.cpp \ - $(SBRDEC_DIR)/sbr_deb.cpp \ - $(SBRDEC_DIR)/sbr_dec.cpp \ - $(SBRDEC_DIR)/sbrdec_drc.cpp \ - $(SBRDEC_DIR)/sbrdec_freq_sca.cpp \ - $(SBRDEC_DIR)/sbrdecoder.cpp \ - $(SBRDEC_DIR)/sbr_ram.cpp \ - $(SBRDEC_DIR)/sbr_rom.cpp - -SBRENC_DIR = $(top_srcdir)/libSBRenc/src + libSBRdec/src/env_calc.cpp \ + libSBRdec/src/env_dec.cpp \ + libSBRdec/src/env_extr.cpp \ + libSBRdec/src/huff_dec.cpp \ + libSBRdec/src/lpp_tran.cpp \ + libSBRdec/src/psbitdec.cpp \ + libSBRdec/src/psdec.cpp \ + libSBRdec/src/psdec_hybrid.cpp \ + libSBRdec/src/sbr_crc.cpp \ + libSBRdec/src/sbr_deb.cpp \ + libSBRdec/src/sbr_dec.cpp \ + libSBRdec/src/sbrdec_drc.cpp \ + libSBRdec/src/sbrdec_freq_sca.cpp \ + libSBRdec/src/sbrdecoder.cpp \ + libSBRdec/src/sbr_ram.cpp \ + libSBRdec/src/sbr_rom.cpp + SBRENC_SRC = \ - $(SBRENC_DIR)/bit_sbr.cpp \ - $(SBRENC_DIR)/env_bit.cpp \ - $(SBRENC_DIR)/fram_gen.cpp \ - $(SBRENC_DIR)/mh_det.cpp \ - $(SBRENC_DIR)/ps_bitenc.cpp \ - $(SBRENC_DIR)/ps_encode.cpp \ - $(SBRENC_DIR)/resampler.cpp \ - $(SBRENC_DIR)/sbr_encoder.cpp \ - $(SBRENC_DIR)/sbr_ram_enc.cpp \ - $(SBRENC_DIR)/ton_corr.cpp \ - $(SBRENC_DIR)/code_env.cpp \ - $(SBRENC_DIR)/env_est.cpp \ - $(SBRENC_DIR)/invf_est.cpp \ - $(SBRENC_DIR)/nf_est.cpp \ - $(SBRENC_DIR)/ps_main.cpp \ - $(SBRENC_DIR)/sbrenc_freq_sca.cpp \ - $(SBRENC_DIR)/sbr_misc.cpp \ - $(SBRENC_DIR)/sbr_rom_enc.cpp \ - $(SBRENC_DIR)/tran_det.cpp - -SYS_DIR = $(top_srcdir)/libSYS/src + libSBRenc/src/bit_sbr.cpp \ + libSBRenc/src/env_bit.cpp \ + libSBRenc/src/fram_gen.cpp \ + libSBRenc/src/mh_det.cpp \ + libSBRenc/src/ps_bitenc.cpp \ + libSBRenc/src/ps_encode.cpp \ + libSBRenc/src/resampler.cpp \ + libSBRenc/src/sbr_encoder.cpp \ + libSBRenc/src/sbr_ram_enc.cpp \ + libSBRenc/src/ton_corr.cpp \ + libSBRenc/src/code_env.cpp \ + libSBRenc/src/env_est.cpp \ + libSBRenc/src/invf_est.cpp \ + libSBRenc/src/nf_est.cpp \ + libSBRenc/src/ps_main.cpp \ + libSBRenc/src/sbrenc_freq_sca.cpp \ + libSBRenc/src/sbr_misc.cpp \ + libSBRenc/src/sbr_rom_enc.cpp \ + libSBRenc/src/tran_det.cpp + SYS_SRC = \ - $(SYS_DIR)/cmdl_parser.cpp \ - $(SYS_DIR)/conv_string.cpp \ - $(SYS_DIR)/genericStds.cpp \ - $(SYS_DIR)/wav_file.cpp + libSYS/src/cmdl_parser.cpp \ + libSYS/src/conv_string.cpp \ + libSYS/src/genericStds.cpp \ + libSYS/src/wav_file.cpp libfdk_aac_la_SOURCES = \ $(AACDEC_SRC) $(AACENC_SRC) \ -- cgit v1.2.3