diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/libfaad/cfft.c | 5 | ||||
| -rw-r--r-- | src/libfaad/common.h | 4 | ||||
| -rw-r--r-- | src/libw32dll/wine/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libxinevdec/Makefile.am | 4 | ||||
| -rw-r--r-- | src/post/goom/Makefile.am | 2 | ||||
| -rw-r--r-- | src/video_out/libdha/config.h | 2 |
8 files changed, 14 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index a18f3caaa..e7f70115a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,14 +6,9 @@ AUTOMAKE_OPTIONS = 1.3 ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = doc m4 intl po misc include src - -DEBFILES = debian/README.Debian debian/changelog debian/control \ - debian/copyright debian/overrides.libxine debian/rules \ - debian/shlibdeps.sh +SUBDIRS = debian doc m4 intl po misc include src EXTRA_DIST = autogen.sh \ - $(DEBFILES) automake.diff \ ChangeLog \ configure \ diff --git a/configure.ac b/configure.ac index b961735ce..e211b6bda 100644 --- a/configure.ac +++ b/configure.ac @@ -1211,6 +1211,7 @@ dnl Output configuration files dnl --------------------------------------------- AC_CONFIG_FILES([ Makefile +debian/Makefile doc/Makefile doc/man/Makefile doc/man/en/Makefile diff --git a/src/libfaad/cfft.c b/src/libfaad/cfft.c index 567e8ce34..a8a6537af 100644 --- a/src/libfaad/cfft.c +++ b/src/libfaad/cfft.c @@ -16,7 +16,7 @@ ** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: cfft.c,v 1.3 2002/12/16 18:59:54 miguelfreitas Exp $ +** $Id: cfft.c,v 1.4 2003/01/31 01:20:26 storri Exp $ **/ /* @@ -547,4 +547,5 @@ void cfftu(cfft_info *cfft) #endif if (cfft) free(cfft); -}
\ No newline at end of file +} + diff --git a/src/libfaad/common.h b/src/libfaad/common.h index dfed6de81..82b1d33d2 100644 --- a/src/libfaad/common.h +++ b/src/libfaad/common.h @@ -16,7 +16,7 @@ ** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** -** $Id: common.h,v 1.5 2002/12/17 16:44:10 jkeil Exp $ +** $Id: common.h,v 1.6 2003/01/31 01:20:27 storri Exp $ **/ #ifndef __COMMON_H__ @@ -96,7 +96,7 @@ typedef float float32_t; #else #ifdef HAVE_CONFIG_H -# include "../config.h" +# include "config.h" #endif #include <stdio.h> diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index 1bd5b493d..a2ff71254 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -2,9 +2,7 @@ EXTRA_DIST = stubs.s wrapper.S noinst_LTLIBRARIES = $(wine_lib) -## we need to override CFLAGS, so don't use AM_CFLAGS -## -CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \ +AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \ -Wmissing-prototypes -Wimplicit-function-declaration \ -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \ -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am index 5e6e2e256..42ecddb8d 100644 --- a/src/libxinevdec/Makefile.am +++ b/src/libxinevdec/Makefile.am @@ -82,6 +82,10 @@ xineplug_decode_interplayvideo_la_SOURCES = interplayvideo.c xineplug_decode_interplayvideo_la_LIBADD = $(XINE_LIB) xineplug_decode_interplayvideo_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ +#xineplug_decode_xan_la_SOURCES = xan/xan.c +#xineplug_decode_xan_la_LIBADD = $(XINE_LIB) +#xineplug_decode_xan_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ + xineplug_decode_yuv_frames_la_SOURCES = yuv_frames.c xineplug_decode_yuv_frames_la_LIBADD = $(XINE_LIB) xineplug_decode_yuv_frames_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am index f0037b7af..50c91a316 100644 --- a/src/post/goom/Makefile.am +++ b/src/post/goom/Makefile.am @@ -9,7 +9,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic EXTRA_DIST = zoom_filter_mmx.c ppc_zoom_ultimate.s ## -fomit-frame-pointer segfaults here -CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g'` +AM_CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g'` libdir = $(XINE_PLUGINDIR)/post diff --git a/src/video_out/libdha/config.h b/src/video_out/libdha/config.h index ede3c13c1..f7c387fb7 100644 --- a/src/video_out/libdha/config.h +++ b/src/video_out/libdha/config.h @@ -1,7 +1,7 @@ #ifndef LIBDHA_CONFIG_H #define LIBDHA_CONFIG_H -#include "../config.h" +#include "config.h" #ifdef TARGET_LINUX //#define CONFIG_DHAHELPER /* doesn't affect virt_to_phys */ |