Commit b3d2d110 authored by Sam Hocevar's avatar Sam Hocevar

* bootstrap: we remove generated files before running the autotools, to

    make sure we get the latest version.
  * bootstrap, Makefile.am: moved the --foreign flag to Makefile.am.
  * src/Makefile.am: renamed an unused _SOURCES variable to something
    automake will not choke on.
  * src/Makefile.am: updated the library version.
parent c7cd7fab
......@@ -4,6 +4,8 @@ SUBDIRS = src examples misc doc debian
EXTRA_DIST=libdvbpsi.spec
AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
doc-dummy:
doc: doc-dummy
......
#! /bin/sh
set -x
rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
# Check for automake
amvers="none"
if automake-1.6 --version >/dev/null 2>&1
......@@ -34,7 +36,7 @@ aclocal${amvers} || exit 1
libtoolize --force --copy || exit 1
autoheader || exit 1
#add --include-deps if you want to bootstrap with any other compiler than gcc
#automake${amvers} --foreign --add-missing --copy --include-deps || exit 1
automake${amvers} --foreign --add-missing --copy || exit 1
#automake${amvers} --add-missing --copy --include-deps || exit 1
automake${amvers} --add-missing --copy || exit 1
autoconf || exit 1
rm -f config.cache
......@@ -4,25 +4,14 @@ pkgincludedir = $(includedir)/dvbpsi
lib_LTLIBRARIES = libdvbpsi.la
lib_descriptors_la_SOURCES = descriptors/dr_02.c \
descriptors/dr_03.c \
descriptors/dr_04.c \
descriptors/dr_05.c \
descriptors/dr_06.c \
descriptors/dr_07.c \
descriptors/dr_08.c \
descriptors/dr_09.c \
descriptors/dr_0a.c \
descriptors/dr_0b.c \
descriptors/dr_0c.c \
descriptors/dr_0d.c \
descriptors/dr_0e.c \
descriptors/dr_0f.c
libdvbpsi_la_SOURCES = dvbpsi.c psi.c descriptor.c tables/pat.c tables/pmt.c $(lib_descriptors_la_SOURCES)
libdvbpsi_la_LDFLAGS = -version-info 1:0:0
noinst_HEADERS = dvbpsi_private.h tables/pat_private.h tables/pmt_private.h
libdvbpsi_la_SOURCES = dvbpsi.c dvbpsi_private.h \
psi.c \
descriptor.c \
$(tables_src) \
$(descriptors_src)
libdvbpsi_la_LDFLAGS = -version-info 1:1:0
pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h tables/pat.h tables/pmt.h \
descriptors/dr_02.h \
descriptors/dr_03.h \
......@@ -40,3 +29,21 @@ pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h tables/pat.h tables/pmt.h \
descriptors/dr_0f.h \
descriptors/dr.h
descriptors_src = descriptors/dr_02.c \
descriptors/dr_03.c \
descriptors/dr_04.c \
descriptors/dr_05.c \
descriptors/dr_06.c \
descriptors/dr_07.c \
descriptors/dr_08.c \
descriptors/dr_09.c \
descriptors/dr_0a.c \
descriptors/dr_0b.c \
descriptors/dr_0c.c \
descriptors/dr_0d.c \
descriptors/dr_0e.c \
descriptors/dr_0f.c
tables_src = tables/pat.c tables/pat_private.h \
tables/pmt.c tables/pmt_private.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment