# HG changeset patch
# User mroi
# Date 1048947388 0
# Node ID f7a26cd00c937e31e2f1eb9161fbea344d49575a
# Parent  5ce26c18c455e61cc166c5afec8e3d99fc09fb2a
* only install the headers that really are intended for public use
* dvdnav.h has to include the headers differently if an application is using it

diff -r 5ce26c18c455 -r f7a26cd00c93 Makefile.am
--- a/Makefile.am	Sat Mar 29 12:21:15 2003 +0000
+++ b/Makefile.am	Sat Mar 29 14:16:28 2003 +0000
@@ -1,5 +1,6 @@
 lib_LTLIBRARIES = libdvdnav.la
 
+AM_CPPFLAGS = -DDVDNAV_COMPILE
 AM_CFLAGS = @THREAD_CFLAGS@
 
 libdvdnav_la_SOURCES = decoder.c dvdnav.c vm.c vmcmd.c \
@@ -9,9 +10,9 @@
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 #	-release $(DVDNAV_MAJOR).$(DVDNAV_MINOR).$(DVDNAV_SUB)
 
-include_HEADERS = decoder.h dvdnav.h dvdnav_events.h \
-	dvdnav_internal.h vm.h vmcmd.h read_cache.h dvd_types.h \
-	remap.h
+include_HEADERS = dvdnav.h dvdnav_events.h dvd_types.h
+noinst_HEADERS = decoder.h dvdnav_internal.h vm.h vmcmd.h \
+	read_cache.h remap.h
 
 EXTRA_DIST = README.MAP FELLOWSHIP.map
 
diff -r 5ce26c18c455 -r f7a26cd00c93 dvdnav.h
--- a/dvdnav.h	Sat Mar 29 12:21:15 2003 +0000
+++ b/dvdnav.h	Sat Mar 29 14:16:28 2003 +0000
@@ -34,11 +34,13 @@
 extern "C" {
 #endif
 
-/* Defines the various events and dvdnav_event_t */
-#include "dvdnav_events.h"
-
-/* Various useful types */
-#include "dvd_types.h"
+#ifdef DVDNAV_COMPILE
+#  include "dvdnav_events.h"
+#  include "dvd_types.h"
+#else
+#  include <dvdnav/dvdnav_events.h>
+#  include <dvdnav/dvd_types.h>
+#endif
 
 #include <dvdread/dvd_reader.h>
 #include <dvdread/ifo_types.h> /* For vm_cmd_t */