diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-09-16 00:01:38 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-09-16 00:01:38 +0000 |
| commit | c62104ed7efd48703aee85ea05205a8f6bfb2f23 (patch) | |
| tree | cd92c68b8ebef066eedf003d1f6650a32f4ada9d /src | |
| parent | 2a6944aa21b4184d8174b74d9c0fbff807c16c4e (diff) | |
| download | xine-lib-c62104ed7efd48703aee85ea05205a8f6bfb2f23.tar.gz xine-lib-c62104ed7efd48703aee85ea05205a8f6bfb2f23.tar.bz2 | |
Few updates. autoconf-2.52/automake-1.5 supported.
CVS patchset: 637
CVS date: 2001/09/16 00:01:38
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/Makefile.am | 4 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index df56389cc..b5f081872 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = audio_out video_out dxr3 input libmpeg2 libspudec demuxers \ - liba52 libffmpeg liblpcm libw32dll libmad xine-engine libdts libvfill + liba52 libffmpeg liblpcm libw32dll libmad libdts libvfill xine-engine debug: @list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am index 915f13530..c2ffc84bc 100644 --- a/src/libffmpeg/libavcodec/Makefile.am +++ b/src/libffmpeg/libavcodec/Makefile.am @@ -5,6 +5,7 @@ #CFLAGS = -D_FILE_OFFSET_BITS=64 @GLOBAL_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H CFLAGS = @GLOBAL_CFLAGS@ @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H +ASFLAGS = LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic @@ -33,6 +34,9 @@ noinst_HEADERS = avcodec.h dsputil.h mpegvideo.h dsputil_mmx_avg.h\ common.h h263data.h mpeg4data.h msmpeg4data.h \ mpeg12data.h +.s.lo: + $(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$< + debug: @$(MAKE) CFLAGS="@DEBUG_CFLAGS@ @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H" diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 0448aba9d..9b8b24303 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -16,7 +16,7 @@ libxine_la_LIBADD = cpu_accel.lo \ $(DYNAMIC_LD_LIBS) \ -lm -libxine_la_LDFLAGS = -version-info 5:0:5 +libxine_la_LDFLAGS = -version-info 9:0:9 include_HEADERS = buffer.h metronom.h configfile.h \ monitor.h cpu_accel.h attributes.h utils.h \ |