Changeset 232


Ignore:
Timestamp:
03/17/07 01:25:28 (14 years ago)
Author:
r2d
Message:

patch from xmixahlx :

  • moved replaygain outside
  • removed build system from /common
Location:
libmpc/branches/r2d
Files:
2 deleted
7 edited
1 moved

Legend:

Unmodified
Added
Removed
  • libmpc/branches/r2d/Makefile.am

    r225 r232  
    11AUTOMAKE_OPTIONS = foreign
    2 SUBDIRS = common libwavformat libreplaygain libmpcpsy libmpcenc libmpcdec \
     2SUBDIRS = libwavformat libmpcpsy libmpcenc libmpcdec \
    33                        mpcenc mpcdec mpcgain mpc2sv8 include
  • libmpc/branches/r2d/configure.in

    r225 r232  
    99AM_PROG_LIBTOOL
    1010
    11 AC_OUTPUT(Makefile libmpcenc/Makefile libmpcpsy/Makefile mpcenc/Makefile libwavformat/Makefile libmpcdec/Makefile mpcdec/Makefile common/Makefile libreplaygain/Makefile mpcgain/Makefile mpc2sv8/Makefile include/Makefile)
     11AC_CHECK_HEADERS(replaygain/gain_analysis.h)
     12
     13AC_OUTPUT(Makefile libmpcenc/Makefile libmpcpsy/Makefile mpcenc/Makefile libwavformat/Makefile libmpcdec/Makefile mpcdec/Makefile mpcgain/Makefile mpc2sv8/Makefile include/Makefile)
  • libmpc/branches/r2d/libmpcdec/Makefile.am

    r219 r232  
    11INCLUDES = -I$(top_srcdir)/include
     2
     3common_sources = ../common/crc32.c \
     4                ../common/huffman-bcl.c
     5
    26METASOURCES = AUTO
    37lib_LTLIBRARIES = libmpcdec.la
    48libmpcdec_la_SOURCES = huffman.c mpc_decoder.c mpc_reader.c \
    5         requant.c       streaminfo.c synth_filter.c mpc_bits_reader.c mpc_demux.c
     9        requant.c       streaminfo.c synth_filter.c mpc_bits_reader.c mpc_demux.c \
     10        $(common_sources)
    611
    712libmpcdec_la_LDFLAGS = -no-undefined -version-info 6:0:0
    813
    9 libmpcdec_la_LIBADD = $(top_builddir)/common/libcommon.a
    10 
    11 
    1214noinst_HEADERS = mpc_bits_reader.h
  • libmpc/branches/r2d/mpc2sv8/Makefile.am

    r203 r232  
    33bin_PROGRAMS = mpc2sv8
    44mpc2sv8_SOURCES = mpc2sv8.c
    5 mpc2sv8_LDADD = $(top_builddir)/libmpcenc/libmpcenc.a \
    6         $(top_builddir)/libmpcdec/libmpcdec.la -lm
     5mpc2sv8_LDADD = -lm \
     6        $(top_builddir)/libmpcdec/libmpcdec.la \
     7        $(top_builddir)/libmpcenc/libmpcenc.a
  • libmpc/branches/r2d/mpcdec/Makefile.am

    r212 r232  
    33bin_PROGRAMS = mpcdec
    44mpcdec_SOURCES = mpcdec.c
    5 mpcdec_LDADD = $(top_builddir)/libwavformat/libwavformat.a \
    6         $(top_builddir)/libmpcdec/libmpcdec.la -lm
     5mpcdec_LDADD = -lm \
     6        $(top_builddir)/libmpcdec/libmpcdec.la \
     7        $(top_builddir)/libwavformat/libwavformat.a
  • libmpc/branches/r2d/mpcenc/Makefile.am

    r165 r232  
    11bin_PROGRAMS = mpcenc
    22
     3common_sources = ../common/crc32.c \
     4                ../common/huffman-bcl.c
    35
    46# set the include path found by configure
     
    911mpcenc_LDFLAGS = $(all_libraries)
    1012mpcenc_SOURCES = keyboard.c mpcenc.c pipeopen.c stderr.c tags.c wave_in.c \
    11         winmsg.c
    12 mpcenc_LDADD = $(top_builddir)/libmpcpsy/libmpcpsy.a \
    13         $(top_builddir)/libmpcenc/libmpcenc.a $(top_builddir)/common/libcommon.a -lm
     13        winmsg.c \
     14        $(common_sources)
     15mpcenc_LDADD = -lm \
     16        $(top_builddir)/libmpcpsy/libmpcpsy.a \
     17        $(top_builddir)/libmpcenc/libmpcenc.a
    1418AM_CFLAGS = -DMPP_ENCODER=1 -DTRUE=1 -DFALSE=0
  • libmpc/branches/r2d/mpcgain/Makefile.am

    r180 r232  
    22METASOURCES = AUTO
    33bin_PROGRAMS = mpcgain
    4 mpcgain_LDADD = $(top_builddir)/libreplaygain/libreplaygain.la \
    5         $(top_builddir)/libmpcdec/libmpcdec.la -lm
     4mpcgain_LDADD = -lm -lreplaygain \
     5        $(top_builddir)/libmpcdec/libmpcdec.la
    66mpcgain_SOURCES = mpcgain.c
    77INCLUDES = -I$(top_srcdir)/include
Note: See TracChangeset for help on using the changeset viewer.