diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | acconfig.h | 5 | ||||
| -rw-r--r-- | include/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libffmpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libffmpeg/config.h | 5 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/idct_mmx.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/bswap.h | 2 |
7 files changed, 15 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index fa4f7264f..8768b1b9c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,7 @@ EXTRA_DIST = cvscompile.sh automake.diff \ noinst_HEADERS = config.h +CONFIG_CLEAN_FILES = libtool-nofpic docs: @cd doc && $(MAKE) $@ @@ -24,11 +25,13 @@ debug: (cd $$subdir && $(MAKE) $@) || exit;\ done; + install-debug: debug @list='$(SUBDIRS)'; for subdir in $$list; do \ (cd $$subdir && $(MAKE) $@) || exit; \ done; + prune-cache: -rm -f config.cache diff --git a/acconfig.h b/acconfig.h index 8e7969521..16853add6 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,3 +1,6 @@ +#ifndef _CONFIG_H_ +#define _CONFIG_H_ + #undef XINE_MAJOR #undef XINE_MINOR #undef XINE_SUB @@ -96,3 +99,5 @@ #ifndef __GNUC__ #define __attribute__(x) /**/ #endif + +#endif diff --git a/include/Makefile.am b/include/Makefile.am index 2ae9ff48a..92b900f98 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -6,6 +6,8 @@ EXTRA_DIST = xine.h.tmpl.in include_HEADERS = xine.h +CONFIG_CLEAN_FILES = xine.h.tmpl xine.h + xine.h: xine.h.tmpl @echo "creating xine.h"; \ rm -f xine.h && \ @@ -13,7 +15,6 @@ xine.h: xine.h.tmpl > xine.h && \ cat xine.h.tmpl >> xine.h - debug: diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index d77e3ad04..ebcf60fbb 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -17,8 +17,6 @@ xineplug_decode_ff_la_LDFLAGS = \ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ -avoid-version -module -noinst_HEADERS = config.h - debug: @list='$(SUBDIRS)'; for subdir in $$list; do \ (cd $$subdir && $(MAKE) $@) || exit;\ diff --git a/src/libffmpeg/config.h b/src/libffmpeg/config.h deleted file mode 100644 index a28db4926..000000000 --- a/src/libffmpeg/config.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * this is just a fake config.h for libavcodec - */ - -#include "../../config.h" diff --git a/src/libffmpeg/libavcodec/idct_mmx.c b/src/libffmpeg/libavcodec/idct_mmx.c index 88fd3b806..7141347ec 100644 --- a/src/libffmpeg/libavcodec/idct_mmx.c +++ b/src/libffmpeg/libavcodec/idct_mmx.c @@ -24,7 +24,9 @@ #include <inttypes.h> -#include "../config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "xineutils.h" diff --git a/src/xine-engine/bswap.h b/src/xine-engine/bswap.h index 21ef3a74e..1351d0456 100644 --- a/src/xine-engine/bswap.h +++ b/src/xine-engine/bswap.h @@ -2,7 +2,9 @@ #define __BSWAP_H__ /* It's need for ffmpeg. Else where will be defined ARCH_X86?*/ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #ifdef HAVE_BYTESWAP_H #include <byteswap.h> |