--- mpeg4ip/lib/mp4v2/Makefile.am.orig	2005-03-10 19:31:34.000000000 +0100
+++ mpeg4ip/lib/mp4v2/Makefile.am	2005-11-05 17:06:35.104197995 +0100
@@ -1,12 +1,12 @@
-SUBDIRS = . test util
+#SUBDIRS = . test util
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/mpeg4ip/include
 
-AM_CXXFLAGS = @BILLS_CPPWARNINGS@
+#AM_CXXFLAGS = @BILLS_CPPWARNINGS@
 
-lib_LTLIBRARIES = libmp4v2.la 
+noinst_LTLIBRARIES = libmp4v2.la 
 
-include_HEADERS = mp4.h
+noinst_HEADERS = mp4.h
 
 libmp4v2_la_SOURCES = \
 	3gp.cpp \