Refreshed Makefile.am based on the new Ducati headers

6 files changed, 25 insertions, 9 deletions

diff --git a/Makefile.am b/Makefile.am
index da4619b..cd56ca3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,18 +2,22 @@
 
 SUBDIRS                      = \
                                packages/codec_engine \
+                               packages/framework_components \
                                packages/ivahd_codecs \
-                               packages/xdctools \
-                               packages/xdais
+                               packages/xdais \
+                               packages/xdctools
 
 lib_LTLIBRARIES              = libdce.la
 
 CE_CFLAGS                    = \
                                -I$(top_srcdir)/ducati \
+                               -I$(top_srcdir)/packages/ \
                                -I$(top_srcdir)/packages/codec_engine \
+                               -I$(top_srcdir)/packages/framework_components \
                                -I$(top_srcdir)/packages/ivahd_codecs \
+                               -I$(top_srcdir)/packages/xdais \
                                -I$(top_srcdir)/packages/xdctools \
-                               -I$(top_srcdir)/packages/xdais
+                               -Wno-pointer-to-int-cast
 
 libdce_la_SOURCES            = libdce.c
 libdce_la_CFLAGS             = $(WARN_CFLAGS) $(CE_CFLAGS) $(DRM_CFLAGS) $(X11_CFLAGS) $(WAYLAND_CFLAGS)
diff --git a/configure.ac b/configure.ac
index 17a1146..ea05551 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,6 +88,7 @@ AC_CONFIG_FILES([
 libdce.pc
 Makefile
 packages/codec_engine/Makefile
+packages/framework_components/Makefile
 packages/ivahd_codecs/Makefile
 packages/xdais/Makefile
 packages/xdctools/Makefile
diff --git a/packages/codec_engine/Makefile.am b/packages/codec_engine/Makefile.am
index aa49592..7a6c170 100644
--- a/packages/codec_engine/Makefile.am
+++ b/packages/codec_engine/Makefile.am
@@ -4,10 +4,11 @@ pkg_includedir = $(includedir)/dce
 
 nobase_pkg_include_HEADERS = \
         ti/sdo/ce/Engine.h \
-        ti/sdo/ce/Server.h \
-        ti/sdo/ce/ipc/Comm.h \
-        ti/sdo/ce/node/node.h \
-        ti/sdo/ce/skel.h \
+        ti/sdo/ce/visa.h \
+        ti/sdo/ce/ServerDefs.h \
         ti/sdo/ce/video3/viddec3.h \
         ti/sdo/ce/video2/videnc2.h \
-        ti/sdo/ce/visa.h
+        ti/sdo/ce/Server.h \
+        ti/sdo/ce/skel.h \
+        ti/sdo/ce/node/node.h \
+        ti/sdo/ce/ipc/Comm.h
diff --git a/packages/framework_components/Makefile.am b/packages/framework_components/Makefile.am
new file mode 100644
index 0000000..d89d584
--- /dev/null
+++ b/packages/framework_components/Makefile.am
@@ -0,0 +1,6 @@
+## Process this file with automake to produce Makefile.in
+
+pkg_includedir = $(includedir)/dce
+
+nobase_pkg_include_HEADERS = \
+        ti/sdo/fc/ires/hdvicp/ires_hdvicp2.h
diff --git a/packages/ivahd_codecs/Makefile.am b/packages/ivahd_codecs/Makefile.am
index 33ca0d8..dc3c6aa 100644
--- a/packages/ivahd_codecs/Makefile.am
+++ b/packages/ivahd_codecs/Makefile.am
@@ -10,4 +10,6 @@ nobase_pkg_include_HEADERS = \
         ti/sdo/codecs/vp7dec/ivp7vdec.h \
         ti/sdo/codecs/mpeg4dec/impeg4vdec.h \
         ti/sdo/codecs/h264dec/ih264vdec.h \
-        ti/sdo/codecs/h264enc/ih264enc.h
+        ti/sdo/codecs/h264enc/ih264enc.h \
+        ti/sdo/codecs/mpeg4enc/impeg4enc.h \
+        ti/sdo/codecs/jpegvdec/ijpegvdec.h
diff --git a/packages/xdais/Makefile.am b/packages/xdais/Makefile.am
index 2bceeca..6aac227 100644
--- a/packages/xdais/Makefile.am
+++ b/packages/xdais/Makefile.am
@@ -8,4 +8,6 @@ nobase_pkg_include_HEADERS = \
         ti/xdais/dm/ivideo.h \
         ti/xdais/dm/xdm.h \
         ti/xdais/ialg.h \
+        ti/xdais/ires.h \
+        ti/xdais/ires_common.h \
         ti/xdais/xdas.h