Mercurial > audlegacy
changeset 571:0d40bfeca9f5 trunk
[svn] Convert aac over, make sure mpg123 is compiled -fPIC
| author | nenolod |
|---|---|
| date | Thu, 02 Feb 2006 15:33:01 -0800 |
| parents | ee984d579bbe |
| children | 694f4b3bfea4 |
| files | Plugins/Input/aac/Makefile.am Plugins/Input/aac/Makefile.in Plugins/Input/aac/libfaad2/Makefile.am Plugins/Input/aac/libfaad2/Makefile.in Plugins/Input/aac/libmp4v2/Makefile.am Plugins/Input/aac/libmp4v2/Makefile.in Plugins/Input/aac/src/Makefile.am Plugins/Input/aac/src/Makefile.in Plugins/Input/mpg123/Makefile.in |
| diffstat | 9 files changed, 122 insertions(+), 129 deletions(-) [+] |
line wrap: on
line diff
--- a/Plugins/Input/aac/Makefile.am Thu Feb 02 14:52:47 2006 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -if ENABLE_AAC -SUBDIRS = libmp4v2 libfaad2 src -endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Input/aac/Makefile.in Thu Feb 02 15:33:01 2006 -0800 @@ -0,0 +1,3 @@ +include ../../../mk/objective.mk + +SUBDIRS = libmp4v2 libfaad2 src
--- a/Plugins/Input/aac/libfaad2/Makefile.am Thu Feb 02 14:52:47 2006 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -noinst_LTLIBRARIES = libfaad.la - -INCLUDE = $(top_srcdir)/include - -libfaad_la_LDFLAGS = -lm - -libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \ -drm_dec.c error.c filtbank.c \ -ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c \ -ps_dec.c ps_syntax.c \ -pulse.c specrec.c syntax.c tns.c hcr.c huffman.c \ -rvlc.c ssr.c ssr_fb.c ssr_ipqf.c common.c \ -sbr_dct.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c \ -sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c \ -analysis.h bits.h cfft.h cfft_tab.h common.h \ -decoder.h drc.h drm_dec.h error.h fixed.h filtbank.h \ -huffman.h ic_predict.h iq_table.h is.h kbd_win.h lt_predict.h mdct.h mp4.h \ -ms.h output.h pns.h pulse.h rvlc.h sine_win.h ssr.h ssr_fb.h ssr_ipqf.h \ -ssr_win.h specrec.h syntax.h structs.h tns.h \ -sbr_dct.h sbr_dec.h sbr_e_nf.h sbr_fbt.h sbr_hfadj.h sbr_hfgen.h \ -sbr_huff.h sbr_noise.h sbr_qmf.h sbr_syntax.h sbr_tf_grid.h \ -sbr_qmf_c.h codebook/hcb.h \ -codebook/hcb_1.h codebook/hcb_2.h codebook/hcb_3.h codebook/hcb_4.h \ -codebook/hcb_5.h codebook/hcb_6.h codebook/hcb_7.h codebook/hcb_8.h \ -codebook/hcb_9.h codebook/hcb_10.h codebook/hcb_11.h codebook/hcb_sf.h \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Input/aac/libfaad2/Makefile.in Thu Feb 02 15:33:01 2006 -0800 @@ -0,0 +1,22 @@ +include ../../../../mk/rules.mk +include ../../../../mk/objective.mk + +CFLAGS += -I../include -I../../../.. -I. -fPIC -DPIC + +OBJECTIVE_LIBS_NOINST = libfaad.a + +LDFLAGS += -lm + +SOURCES = bits.c cfft.c decoder.c drc.c \ + drm_dec.c error.c filtbank.c \ + ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c \ + ps_dec.c ps_syntax.c \ + pulse.c specrec.c syntax.c tns.c hcr.c huffman.c \ + rvlc.c ssr.c ssr_fb.c ssr_ipqf.c common.c \ + sbr_dct.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c \ + sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c + +OBJECTS = ${SOURCES:.c=.o} + +libfaad.a: $(OBJECTS) + $(AR) cq $@ $(OBJECTS)
--- a/Plugins/Input/aac/libmp4v2/Makefile.am Thu Feb 02 14:52:47 2006 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -INCLUDES = -I../include -I. - -noinst_LTLIBRARIES = libmp4v2.la - -include_HEADERS = mp4.h - -libmp4v2_la_SOURCES = \ - 3gp.cpp \ - atom_amr.cpp \ - atom_avc1.cpp \ - atom_avcC.cpp \ - atom_d263.cpp \ - atom_damr.cpp \ - atom_dref.cpp \ - atom_elst.cpp \ - atom_enca.cpp \ - atom_encv.cpp \ - atom_free.cpp \ - atom_ftyp.cpp \ - atom_hdlr.cpp \ - atom_hinf.cpp \ - atom_hnti.cpp \ - atom_href.cpp \ - atom_mdat.cpp \ - atom_mdhd.cpp \ - atom_meta.cpp \ - atom_mp4a.cpp \ - atom_mp4s.cpp \ - atom_mp4v.cpp \ - atom_mvhd.cpp \ - atom_root.cpp \ - atom_rtp.cpp \ - atom_s263.cpp \ - atom_sdp.cpp \ - atoms.h \ - atom_smi.cpp \ - atom_sound.cpp \ - atom_standard.cpp \ - atom_stbl.cpp \ - atom_stdp.cpp \ - atom_stsc.cpp \ - atom_stsd.cpp \ - atom_stsz.cpp \ - atom_tfhd.cpp \ - atom_tkhd.cpp \ - atom_treftype.cpp \ - atom_trun.cpp \ - atom_udta.cpp \ - atom_url.cpp \ - atom_urn.cpp \ - atom_video.cpp \ - atom_vmhd.cpp \ - descriptors.cpp \ - descriptors.h \ - isma.cpp \ - mp4array.h \ - mp4atom.cpp \ - mp4atom.h \ - mp4common.h \ - mp4container.cpp \ - mp4container.h \ - mp4.cpp \ - mp4descriptor.cpp \ - mp4descriptor.h \ - mp4file.cpp \ - mp4file.h \ - mp4file_io.cpp \ - mp4info.cpp \ - mp4meta.cpp \ - mp4property.cpp \ - mp4property.h \ - mp4track.cpp \ - mp4track.h \ - mp4util.cpp \ - mp4util.h \ - ocidescriptors.cpp \ - ocidescriptors.h \ - odcommands.cpp \ - odcommands.h \ - qosqualifiers.cpp \ - qosqualifiers.h \ - rtphint.cpp \ - rtphint.h - -libmp4v2_la_LDFLAGS = -lstdc++ - -EXTRA_DIST = API_CHANGES \ - INTERNALS \ - libmp4v260.dsp \ - libmp4v2_st60.dsp \ - TODO
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Input/aac/libmp4v2/Makefile.in Thu Feb 02 15:33:01 2006 -0800 @@ -0,0 +1,74 @@ +include ../../../../mk/rules.mk +include ../../../../mk/objective.mk + +CXXFLAGS += $(GTK_CFLAGS) -fPIC -DPIC -I../include -I../../../.. -I. + +OBJECTIVE_LIBS_NOINST = libmp4v2.a + +SOURCES = \ + 3gp.cpp \ + atom_amr.cpp \ + atom_avc1.cpp \ + atom_avcC.cpp \ + atom_d263.cpp \ + atom_damr.cpp \ + atom_dref.cpp \ + atom_elst.cpp \ + atom_enca.cpp \ + atom_encv.cpp \ + atom_free.cpp \ + atom_ftyp.cpp \ + atom_hdlr.cpp \ + atom_hinf.cpp \ + atom_hnti.cpp \ + atom_href.cpp \ + atom_mdat.cpp \ + atom_mdhd.cpp \ + atom_meta.cpp \ + atom_mp4a.cpp \ + atom_mp4s.cpp \ + atom_mp4v.cpp \ + atom_mvhd.cpp \ + atom_root.cpp \ + atom_rtp.cpp \ + atom_s263.cpp \ + atom_sdp.cpp \ + atom_smi.cpp \ + atom_sound.cpp \ + atom_standard.cpp \ + atom_stbl.cpp \ + atom_stdp.cpp \ + atom_stsc.cpp \ + atom_stsd.cpp \ + atom_stsz.cpp \ + atom_tfhd.cpp \ + atom_tkhd.cpp \ + atom_treftype.cpp \ + atom_trun.cpp \ + atom_udta.cpp \ + atom_url.cpp \ + atom_urn.cpp \ + atom_video.cpp \ + atom_vmhd.cpp \ + descriptors.cpp \ + isma.cpp \ + mp4atom.cpp \ + mp4container.cpp \ + mp4.cpp \ + mp4descriptor.cpp \ + mp4file.cpp \ + mp4file_io.cpp \ + mp4info.cpp \ + mp4meta.cpp \ + mp4property.cpp \ + mp4track.cpp \ + mp4util.cpp \ + ocidescriptors.cpp \ + odcommands.cpp \ + qosqualifiers.cpp \ + rtphint.cpp + +OBJECTS = ${SOURCES:.cpp=.o} + +libmp4v2.a: $(OBJECTS) + $(AR) cq $@ $(OBJECTS)
--- a/Plugins/Input/aac/src/Makefile.am Thu Feb 02 14:52:47 2006 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -lib_LTLIBRARIES = libaac.la - -libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) - -libaac_la_LDFLAGS = $(PLUGIN_LDFLAGS) ../libmp4v2/libmp4v2.la ../libfaad2/libfaad.la -lstdc++ - -libaac_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c tagging_mp4.c fileinfo.c - -INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir) -I../include -I../libmp4v2 -I../libfaad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Input/aac/src/Makefile.in Thu Feb 02 15:33:01 2006 -0800 @@ -0,0 +1,20 @@ +include ../../../../mk/rules.mk +include ../../../../mk/objective.mk + +OBJECTIVE_LIBS = libaac.so + +CFLAGS += -fPIC -DPIC + +# override objective make's LIBDIR +LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) + +LDFLAGS += ../libmp4v2/libmp4v2.a ../libfaad2/libfaad.a -lstdc++ + +SOURCES = libmp4.c mp4_utils.c aac_utils.c tagging_mp4.c fileinfo.c + +OBJECTS = ${SOURCES:.c=.o} + +CFLAGS += $(GTK_CFLAGS) -I../../../../intl -I../../../.. -I../include -I../libmp4v2 -I../libfaad + +libaac.so: $(OBJECTS) + $(CC) -fPIC -DPIC -shared -o $@ $(OBJECTS) $(LDFLAGS)
--- a/Plugins/Input/mpg123/Makefile.in Thu Feb 02 14:52:47 2006 -0800 +++ b/Plugins/Input/mpg123/Makefile.in Thu Feb 02 15:33:01 2006 -0800 @@ -15,5 +15,7 @@ CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../.. +LDFLAGS = $(GTK_LIBS) + libmpg123.so: $(OBJECTS) - $(CC) $(CFLAGS) -shared $(OBJECTS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) -shared $(OBJECTS) -o $@