move the header files to include directory.

The exposed header files is at include directory now.

Change-Id: I2ba32fb4920e1e3dfd71befbfd8b1e885a83db19

diff --git a/Makefile.am b/Makefile.am
index d8b525d..f07dd9f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 if HAVE_HALTESTS
-SUBDIRS = src haltests
+SUBDIRS = include src haltests
 else
-SUBDIRS = src
+SUBDIRS = include src
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/configure.ac b/configure.ac
index fc14ad5..830dc31 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -109,7 +109,8 @@ esac
 AM_CONDITIONAL(HOST_CPU_X86_64, test "x$HOST_CPU_X86_64" = "xyes")
 
 AC_OUTPUT([
-   src/Makefile
+       include/Makefile
+       src/Makefile
        Makefile
        libtbm.pc
        haltests/Makefile])

diff --git a/haltests/Makefile.am b/haltests/Makefile.am
index 08f21a8..ae5d033 100644 (file)
--- a/haltests/Makefile.am
+++ b/haltests/Makefile.am
@@ -14,6 +14,7 @@ tbm_haltests_SOURCES = \
 tbm_haltests_CXXFLAGS = \
        @DLOG_CFLAGS@ \
        ${CXXFLAGS} \
+       -I$(top_builddir)/include \
        -I$(top_builddir)/src \
        -I$(includedir)/gtest
 

diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644 (file)
index 0000000..255ec9c
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,15 @@
+libtbmincludedir=$(includedir)
+libtbminclude_HEADERS = \
+                                               tbm_type.h \
+                                               tbm_type_common.h \
+                                               tbm_log.h \
+                                               tbm_error.h \
+                                               tbm_bufmgr.h \
+                                               tbm_bo.h \
+                                               tbm_surface.h \
+                                               tbm_surface_internal.h \
+                                               tbm_surface_queue.h \
+                                               tbm_sync.h \
+                                               tbm_drm_helper.h \
+                                               tbm_bufmgr_backend.h \
+                                               tbm_backend.h

diff --git a/src/tbm_backend.h b/include/tbm_backend.h
similarity index 100%
rename from src/tbm_backend.h
rename to include/tbm_backend.h

diff --git a/src/tbm_bo.h b/include/tbm_bo.h
similarity index 100%
rename from src/tbm_bo.h
rename to include/tbm_bo.h

diff --git a/src/tbm_bufmgr.h b/include/tbm_bufmgr.h
similarity index 100%
rename from src/tbm_bufmgr.h
rename to include/tbm_bufmgr.h

diff --git a/src/tbm_bufmgr_backend.h b/include/tbm_bufmgr_backend.h
similarity index 100%
rename from src/tbm_bufmgr_backend.h
rename to include/tbm_bufmgr_backend.h

diff --git a/src/tbm_drm_helper.h b/include/tbm_drm_helper.h
similarity index 100%
rename from src/tbm_drm_helper.h
rename to include/tbm_drm_helper.h

diff --git a/src/tbm_error.h b/include/tbm_error.h
similarity index 100%
rename from src/tbm_error.h
rename to include/tbm_error.h

diff --git a/src/tbm_log.h b/include/tbm_log.h
similarity index 100%
rename from src/tbm_log.h
rename to include/tbm_log.h

diff --git a/src/tbm_surface.h b/include/tbm_surface.h
similarity index 100%
rename from src/tbm_surface.h
rename to include/tbm_surface.h

diff --git a/src/tbm_surface_internal.h b/include/tbm_surface_internal.h
similarity index 100%
rename from src/tbm_surface_internal.h
rename to include/tbm_surface_internal.h

diff --git a/src/tbm_surface_queue.h b/include/tbm_surface_queue.h
similarity index 100%
rename from src/tbm_surface_queue.h
rename to include/tbm_surface_queue.h

diff --git a/src/tbm_sync.h b/include/tbm_sync.h
similarity index 100%
rename from src/tbm_sync.h
rename to include/tbm_sync.h

diff --git a/src/tbm_type.h b/include/tbm_type.h
similarity index 100%
rename from src/tbm_type.h
rename to include/tbm_type.h

diff --git a/src/tbm_type_common.h b/include/tbm_type_common.h
similarity index 100%
rename from src/tbm_type_common.h
rename to include/tbm_type_common.h

diff --git a/packaging/libtbm.spec b/packaging/libtbm.spec
index 6ce038e..bc28567 100644 (file)
--- a/packaging/libtbm.spec
+++ b/packaging/libtbm.spec
@@ -104,19 +104,7 @@ rm -f %{_unitdir_user}/basic.target.wants/tbm-drm-auth-user.path
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %dir %{_includedir}
-%{_includedir}/tbm_bufmgr.h
-%{_includedir}/tbm_surface.h
-%{_includedir}/tbm_surface_internal.h
-%{_includedir}/tbm_surface_queue.h
-%{_includedir}/tbm_bufmgr_backend.h
-%{_includedir}/tbm_type.h
-%{_includedir}/tbm_type_common.h
-%{_includedir}/tbm_drm_helper.h
-%{_includedir}/tbm_sync.h
-%{_includedir}/tbm_bo.h
-%{_includedir}/tbm_log.h
-%{_includedir}/tbm_error.h
-%{_includedir}/tbm_backend.h
+%{_includedir}/tbm_*.h
 %{_libdir}/libtbm.so
 %{_libdir}/pkgconfig/libtbm.pc
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 03d1d5b..0ab96ac 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@ AM_CFLAGS = \
        $(WARN_CFLAGS) \
        -I./ \
        -I$(top_srcdir) \
+       -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
        @LIBTBM_CFLAGS@ \
        $(CFLAGS)
@@ -43,19 +44,4 @@ nodist_libtbm_la_SOURCES =           \
 
 BUILT_SOURCES = $(nodist_libtbm_la_SOURCES)
 
-libtbmincludedir=$(includedir)
-libtbminclude_HEADERS = tbm_bufmgr.h \
-                                               tbm_bo.h \
-                                               tbm_surface.h \
-                                               tbm_bufmgr_backend.h \
-                                               tbm_type.h \
-                                               tbm_type_common.h \
-                                               tbm_surface_internal.h \
-                                               tbm_surface_queue.h \
-                                               tbm_drm_helper.h \
-                                               tbm_sync.h \
-                                               tbm_log.h \
-                                               tbm_error.h \
-                                               tbm_backend.h
-
 CLEANFILES = $(BUILT_SOURCES)