* */Makefile.am: reworked automake directories to avoid linking problems

    on Mac OS X.
  * Bumped up revision number to 0.1.2.

.cvsignore

@@ -4,6 +4,7 @@ config.cache
 config.status
 config.guess
 config.status
+config.sub
 config.h
 config.h.in
 Makefile
@@ -17,3 +18,4 @@ libtool
 ltmain.sh
 missing
 mkinstalldirs
+depcomp

ChangeLog

@@ -2,7 +2,8 @@
 # ChangeLog for libdvbpsi #
 #=========================#
 
-HEAD
+0.1.2
+**
 
   * configure.ac, bootstrap: removed redundant stuff from CVS such as the
     Makefile.in files, configure and config.*, and added a bootstrap script
@@ -14,9 +15,12 @@ HEAD
   * configure.in, ltmain.sh: fixes for Solaris, mingw and Mac OS X.
   * src/tables/pmt.c: fixed the PMT generator which used to add one PSI
     section for one ES.
+  * */Makefile.am: reworked automake directories to avoid linking problems
+    on Mac OS X.
 
 0.1.1
 Sat, 18 May 2002 13:30:44 +0200
+
   * src/descriptor.h, src/descriptor.c: added a p_decoded field to the
     dvbpsi_descriptor_s structure.
   * src/descriptor.h, src/descriptor.c, src/tables/pmt.c: added an 's' to the

configure.ac

@@ -54,7 +54,7 @@ fi
 dnl Check for headers
 AC_CHECK_HEADERS(stdint.h inttypes.h)
 
-AC_OUTPUT([Makefile src/Makefile src/tables/Makefile src/descriptors/Makefile examples/Makefile misc/Makefile doc/Makefile debian/Makefile])
+AC_OUTPUT([Makefile src/Makefile examples/Makefile misc/Makefile doc/Makefile debian/Makefile])
 
 echo "
 libdvbpsi configuration

src/Makefile.am

@@ -2,14 +2,41 @@
 
 pkgincludedir = $(includedir)/dvbpsi
 
-SUBDIRS = tables descriptors
-
 lib_LTLIBRARIES = libdvbpsi.la
 
-libdvbpsi_la_SOURCES = dvbpsi.c psi.c descriptor.c
-libdvbpsi_la_LIBADD = tables/lib_tables.la descriptors/lib_descriptors.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
-pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h
+noinst_HEADERS = dvbpsi_private.h tables/pat_private.h tables/pmt_private.h
+pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h tables/pat.h tables/pmt.h \
+                     descriptors/dr_02.h \
+                     descriptors/dr_03.h \
+                     descriptors/dr_04.h \
+                     descriptors/dr_05.h \
+                     descriptors/dr_06.h \
+                     descriptors/dr_07.h \
+                     descriptors/dr_08.h \
+                     descriptors/dr_09.h \
+                     descriptors/dr_0a.h \
+                     descriptors/dr_0b.h \
+                     descriptors/dr_0c.h \
+                     descriptors/dr_0d.h \
+                     descriptors/dr_0e.h \
+                     descriptors/dr_0f.h \
+                     descriptors/dr.h
 

src/descriptors/Makefile.am

-## Process this file with automake to produce Makefile.in
-
-pkgincludedir = $(includedir)/dvbpsi
-
-noinst_LTLIBRARIES = lib_descriptors.la
-
-lib_descriptors_la_SOURCES = dr_02.c \
-                             dr_03.c \
-                             dr_04.c \
-                             dr_05.c \
-                             dr_06.c \
-                             dr_07.c \
-                             dr_08.c \
-                             dr_09.c \
-                             dr_0a.c \
-                             dr_0b.c \
-                             dr_0c.c \
-                             dr_0d.c \
-                             dr_0e.c \
-                             dr_0f.c
-
-pkginclude_HEADERS = dr_02.h \
-                     dr_03.h \
-                     dr_04.h \
-                     dr_05.h \
-                     dr_06.h \
-                     dr_07.h \
-                     dr_08.h \
-                     dr_09.h \
-                     dr_0a.h \
-                     dr_0b.h \
-                     dr_0c.h \
-                     dr_0d.h \
-                     dr_0e.h \
-                     dr_0f.h \
-                     dr.h
-

src/tables/Makefile.am

-## Process this file with automake to produce Makefile.in
-
-pkgincludedir = $(includedir)/dvbpsi
-
-noinst_LTLIBRARIES = lib_tables.la
-
-lib_tables_la_SOURCES = pat.c pmt.c
-
-noinst_HEADERS = pat_private.h pmt_private.h
-
-pkginclude_HEADERS = pat.h pmt.h
-