Updated cvscompile.sh to look for configure.ac

Replaced configure.in with configure.ac
Remove acconfig.h (Unnecessary with autoconf 2.52 or above)
Updated configure.ac to remove deprecated macros, upgraded
  AC_DEFINE to include comments, merged in acconfig.h.
Combined libxine and libxineutils into one library. libxineutils
  is created but not installed. Its statically linked into libxine.
Advanced libxine version from 0.2.0 to 1.0.0
Removed references for skins.
Plugins now installed to <libdir>/xine/plugins/$XINE_MAJOR.$XINE_MORE.
$XINE_SUB
Xine-config updated for new location of plugins
Sorted file lists in Makefile.am to make them more readable.
TODO: remove skins references from xine-config

CVS patchset: 2705
CVS date: 2002/09/19 06:01:18

11 files changed, 95 insertions, 51 deletions

diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 2806170e1..2136ed73f 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -1,9 +1,13 @@
 SUBDIRS = libdha vidix
 
-VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix -I$(top_srcdir)/src/video_out/vidix
+VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \
+	-I$(top_srcdir)/src/video_out/vidix
 
-CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
-DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
+CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) \
+	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
+
+DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) \
+	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
@@ -51,24 +55,28 @@ endif
 lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(aa_module)
 
 xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c
-xineplug_vo_out_xv_la_LIBADD =  $(XV_LIB) $(X_LIBS) -lXext \
-	$(top_builddir)/src/xine-utils/libxineutils.la
+xineplug_vo_out_xv_la_LIBADD = \
+	$(XV_LIB) \
+	$(X_LIBS) \
+	-lXext \
+	$(top_builddir)/src/xine-engine/libxine.la
+
 xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 	alphablend.c video_out_xshm.c
 xineplug_vo_out_xshm_la_LIBADD =  $(X_LIBS) -lXext \
-	$(top_builddir)/src/xine-utils/libxineutils.la
+	$(top_builddir)/src/xine-engine/libxine.la
 xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
 
 #xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 #	alphablend.c video_out_opengl.c
 #xineplug_vo_out_opengl_la_LIBADD =  $(OPENGL_LIBS) $(GLUT_LIBS) $(GLU_LIBS) $(X_LIBS) \
-#	$(top_builddir)/src/xine-utils/libxineutils.la
+#	$(top_builddir)/src/xine-engine/libxine.la
 #xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module
 #
 #xineplug_vo_out_syncfb_la_SOURCES = alphablend.c video_out_syncfb.c 
-#xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(top_builddir)/src/xine-utils/libxineutils.la
+#xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(top_builddir)/src/xine-engine/libxine.la
 #xineplug_vo_out_syncfb_la_LDFLAGS = -avoid-version -module
 #
 xineplug_vo_out_aa_la_SOURCES =  video_out_aa.c
@@ -77,7 +85,7 @@ xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module
 #
 #xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 #	alphablend.c video_out_fb.c
-#xineplug_vo_out_fb_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
+#xineplug_vo_out_fb_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 #xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module
 #
 #xineplug_vo_out_directfb_la_SOURCES = alphablend.c video_out_directfb.c
@@ -92,7 +100,7 @@ xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module
 #xineplug_vo_out_vidix_la_LIBADD =  $(X_LIBS) $(top_builddir)/src/video_out/vidix/libvidix.la
 #xineplug_vo_out_vidix_la_LDFLAGS = -avoid-version -module
 
-noinst_HEADERS = yuv2rgb.h video_out_syncfb.h alphablend.h deinterlace.h
+noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h yuv2rgb.h 
 
 debug:
 	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -DXINE_COMPILE"
diff --git a/src/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am
index 4115b2143..79d9617c5 100644
--- a/src/video_out/libdha/Makefile.am
+++ b/src/video_out/libdha/Makefile.am
@@ -19,7 +19,7 @@ EXTRA_PROGRAMS = test
 test_SOURCES = test.c
 test_LDADD = $(top_builddir)/src/video_out/libdha/libdha.la
 
-noinst_HEADERS = AsmMacros.h libdha.h
+noinst_HEADERS = AsmMacros.h libdha.h pci_ids.h pci_names.h pci_vendors.h
 
 ## for OpenBSD LIBS += -li386
 
diff --git a/src/video_out/libdha/sysdep/Makefile.am b/src/video_out/libdha/sysdep/Makefile.am
index 70fc43949..5dc3ef70f 100644
--- a/src/video_out/libdha/sysdep/Makefile.am
+++ b/src/video_out/libdha/sysdep/Makefile.am
@@ -1,10 +1,33 @@
-EXTRA_DIST = libdha_os2.c pci_arm32.c pci_isc.c pci_netbsd.c pci_sco.c pci_x86.c \
-	libdha_win32.c pci_bsdi.c pci_linux.c pci_openbsd.c pci_sparc.c pci_386bsd.c \
-	pci_freebsd.c pci_lynx.c pci_os2.c pci_svr4.c pci_alpha.c pci_ia64.c pci_mach386.c \
-	pci_powerpc.c pci_win32.c
-
-noinst_HEADERS = AsmMacros_alpha.h AsmMacros_ia64.h AsmMacros_sparc.h AsmMacros_arm32.h \
-	AsmMacros_powerpc.h AsmMacros_x86.h
+EXTRA_DIST = \
+	libdha_os2.c \
+	libdha_win32.c \
+	pci_386bsd.c \
+	pci_alpha.c \
+	pci_arm32.c \
+	pci_bsdi.c \
+	pci_freebsd.c \
+	pci_ia64.c \
+	pci_isc.c \
+	pci_linux.c \
+	pci_lynx.c \
+	pci_mach386.c \
+	pci_netbsd.c \
+	pci_openbsd.c \
+	pci_os2.c \
+	pci_powerpc.c \
+	pci_sco.c \
+	pci_sparc.c \
+	pci_svr4.c \
+	pci_win32.c \
+	pci_x86.c
+	
+noinst_HEADERS = \
+	AsmMacros_alpha.h \
+	AsmMacros_arm32.h \
+	AsmMacros_ia64.h \
+	AsmMacros_powerpc.h \
+	AsmMacros_sparc.h \
+	AsmMacros_x86.h
 
 debug:
 install-debug:
diff --git a/src/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am
index c32751d1a..f89457457 100644
--- a/src/video_out/vidix/Makefile.am
+++ b/src/video_out/vidix/Makefile.am
@@ -14,6 +14,9 @@ libvidix_la_SOURCES = vidixlib.c
 
 noinst_HEADERS = fourcc.h vidix.h vidixlib.h
 
+AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
+	-I$(top_srcdir)/src/video_out/libdha
+
 debug:
 	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @STATIC@ -DXINE_COMPILE"
 
diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am
index 8c0bb6f3d..a68628646 100644
--- a/src/video_out/vidix/drivers/Makefile.am
+++ b/src/video_out/vidix/drivers/Makefile.am
@@ -4,8 +4,15 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 libdir = $(XINE_PLUGINDIR)/vidix
 
 if HAVE_VIDIX
-vidix_drivers = radeon_vid.la rage128_vid.la pm3_vid.la mach64_vid.la nvidia_vid.la \
-	genfb_vid.la mga_vid.la mga_crtc2_vid.la
+vidix_drivers = \
+	genfb_vid.la \
+	mach64_vid.la \
+	mga_crtc2_vid.la \
+	mga_vid.la \
+	nvidia_vid.la \
+	pm3_vid.la \
+	radeon_vid.la \
+	rage128_vid.la
 endif
 
 lib_LTLIBRARIES = $(vidix_drivers)
@@ -74,6 +81,9 @@ mga_crtc2_vid_la_LDFLAGS = -avoid-version -module
 
 noinst_HEADERS = mach64.h nvidia.h pm3_regs.h radeon.h
 
+AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
+	-I$(top_srcdir)/src/video_out/libdha
+
 debug:
 	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -DXINE_COMPILE"
 
diff --git a/src/video_out/vidix/drivers/genfb_vid.c b/src/video_out/vidix/drivers/genfb_vid.c
index 3dacd4beb..82633eda3 100644
--- a/src/video_out/vidix/drivers/genfb_vid.c
+++ b/src/video_out/vidix/drivers/genfb_vid.c
@@ -6,11 +6,11 @@
 #include <inttypes.h>
 #include <fcntl.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 
 #define DEMO_DRIVER 1
 
diff --git a/src/video_out/vidix/drivers/mach64_vid.c b/src/video_out/vidix/drivers/mach64_vid.c
index 9b630375f..8c4f00868 100644
--- a/src/video_out/vidix/drivers/mach64_vid.c
+++ b/src/video_out/vidix/drivers/mach64_vid.c
@@ -25,11 +25,11 @@
 #endif
 
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 
 #include "mach64.h"
 
diff --git a/src/video_out/vidix/drivers/mga_vid.c b/src/video_out/vidix/drivers/mga_vid.c
index f34f5ed20..39b2176b2 100644
--- a/src/video_out/vidix/drivers/mga_vid.c
+++ b/src/video_out/vidix/drivers/mga_vid.c
@@ -54,11 +54,11 @@
 #include <math.h>
 #include <inttypes.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 
 #if    !defined(ENOTSUP) && defined(EOPNOTSUPP)
 #define ENOTSUP EOPNOTSUPP
diff --git a/src/video_out/vidix/drivers/nvidia_vid.c b/src/video_out/vidix/drivers/nvidia_vid.c
index 0a639e93a..4f40fdd33 100644
--- a/src/video_out/vidix/drivers/nvidia_vid.c
+++ b/src/video_out/vidix/drivers/nvidia_vid.c
@@ -5,11 +5,11 @@
 #include <math.h>
 #include <inttypes.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 
 #include "nvidia.h"
 
diff --git a/src/video_out/vidix/drivers/pm3_vid.c b/src/video_out/vidix/drivers/pm3_vid.c
index 2078113cc..c5b97782c 100644
--- a/src/video_out/vidix/drivers/pm3_vid.c
+++ b/src/video_out/vidix/drivers/pm3_vid.c
@@ -25,12 +25,12 @@
 #include <inttypes.h>
 #include <unistd.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
+#include "config.h"
 
 #include "pm3_regs.h"
 
diff --git a/src/video_out/vidix/drivers/radeon_vid.c b/src/video_out/vidix/drivers/radeon_vid.c
index ed5a4ee41..8d8805264 100644
--- a/src/video_out/vidix/drivers/radeon_vid.c
+++ b/src/video_out/vidix/drivers/radeon_vid.c
@@ -12,11 +12,11 @@
 #include <math.h>
 #include <inttypes.h>
 #include <sys/mman.h>
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "libdha.h"
 #include "radeon.h"
 
 #ifdef RAGE128