summaryrefslogtreecommitdiff
path: root/src/input/vcd/libvcd
diff options
context:
space:
mode:
authorMatt Messier <mmessier@grapetv.org>2007-05-11 18:24:25 -0400
committerMatt Messier <mmessier@grapetv.org>2007-05-11 18:24:25 -0400
commit913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e (patch)
tree302709e5d1b4467072623bd925a460fa19daa36b /src/input/vcd/libvcd
parent00dccb98dfe1ff21e14275b09806cbe4d69a3273 (diff)
downloadxine-lib-913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e.tar.gz
xine-lib-913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e.tar.bz2
Another pass at cleaning up Makefile.am files. More to come.
Diffstat (limited to 'src/input/vcd/libvcd')
-rw-r--r--src/input/vcd/libvcd/Makefile.am66
1 files changed, 28 insertions, 38 deletions
diff --git a/src/input/vcd/libvcd/Makefile.am b/src/input/vcd/libvcd/Makefile.am
index cba784d26..65ffc6255 100644
--- a/src/input/vcd/libvcd/Makefile.am
+++ b/src/input/vcd/libvcd/Makefile.am
@@ -1,13 +1,35 @@
include $(top_srcdir)/misc/Makefile.common
AM_CFLAGS = $(DEFAULT_OCFLAGS)
-AM_LDFLAGS = $(xineplug_ldflags)
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
SUBDIRS = libvcd
-INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib
+noinst_HEADERS = \
+ vcd_assert.h \
+ data_structures.h \
+ info_private.h \
+ pbc.h \
+ stream_stdio.h \
+ bitvec.h \
+ dict.h \
+ mpeg.h \
+ salloc.h \
+ util.h \
+ bytesex_asm.h \
+ directory.h \
+ mpeg_stream.h \
+ sector_private.h \
+ vcd.h \
+ bytesex.h \
+ image_sink.h \
+ obj.h \
+ stream.h \
+ vcd_read.h
-libvcd_SRCS = \
+noinst_LTLIBRARIES = libvcd.la libvcdinfo.la
+libvcd_la_SOURCES = \
vcd.c \
data_structures.c \
directory.c \
@@ -25,43 +47,11 @@ libvcd_SRCS = \
stream.c \
stream_stdio.c \
util.c
+libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS)
+libvcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS)
-libvcdinfo_SRCS = \
+libvcdinfo_la_SOURCES = \
info.c \
inf.c \
info_private.c \
vcd_read.c
-
-EXTRA_DIST = $(libvcd_SRCS) $(libvcdinfo_SRCS)
-
-if ENABLE_VCD
-if HAVE_VCDNAV
-else
-noinst_LTLIBRARIES = libvcd.la libvcdinfo.la
-libvcd_la_SOURCES = $(libvcd_SRCS)
-libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS)
-libvcdinfo_la_SOURCES = $(libvcdinfo_SRCS)
-endif
-endif
-
-noinst_HEADERS = \
- vcd_assert.h \
- data_structures.h \
- info_private.h \
- pbc.h \
- stream_stdio.h \
- bitvec.h \
- dict.h \
- mpeg.h \
- salloc.h \
- util.h \
- bytesex_asm.h \
- directory.h \
- mpeg_stream.h \
- sector_private.h \
- vcd.h \
- bytesex.h \
- image_sink.h \
- obj.h \
- stream.h \
- vcd_read.h