Adding missing header files

Change-Id: Iba7bfc9eb9bf54c24a3a492a5d0851d2cbfb4b6b
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>

diff --git a/packaging/vconf-buxton.spec b/packaging/vconf-buxton.spec
index efadc59..e611274 100644 (file)
--- a/packaging/vconf-buxton.spec
+++ b/packaging/vconf-buxton.spec
@@ -64,6 +64,7 @@ ln -sf ../%{libname}-setup.service %{buildroot}%{_unitdir}/basic.target.wants/
 
 %post
 /sbin/ldconfig
+vconf-buxton-init-from-vconf.sh
 
 %postun
 /sbin/ldconfig
@@ -81,11 +82,13 @@ ln -sf ../%{libname}-setup.service %{buildroot}%{_unitdir}/basic.target.wants/
 
 %files devel
 %manifest %{name}.manifest
+%{_includedir}/vconf/vconf.h
 %{_includedir}/vconf/vconf-buxton.h
 %{_libdir}/pkgconfig/%{libname}.pc
 %{_libdir}/lib%{libname}.so
 
 %files keys-devel
 %manifest %{name}.manifest
+%{_includedir}/vconf/vconf-keys.h
 %{_includedir}/vconf/vconf-buxton-keys.h
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8e2701f..d5c141c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,4 +34,6 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc DESTINATION ${LIB_INSTAL
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/vconf-buxton.h DESTINATION include/vconf)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/vconf-buxton-keys.h DESTINATION include/vconf)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/vconf-buxton-setup.service DESTINATION ${SYSTEMDDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/vconf.h DESTINATION include/vconf)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/vconf-keys.h DESTINATION include/vconf)
 

diff --git a/src/vconf-buxton.pc.in b/src/vconf-buxton.pc.in
index b107382..dc2e310 100644 (file)
--- a/src/vconf-buxton.pc.in
+++ b/src/vconf-buxton.pc.in
@@ -6,5 +6,5 @@ includedir=@INCLUDEDIR@
 Name: vconf-buxton
 Description: configuration system library
 Version: @VERSION@
-Libs: -L${libdir} -lvconf-buxton -lpthread
+Libs: -L${libdir} -l@LIBNAME@ -lpthread
 Cflags: -I${includedir}

diff --git a/src/vconf-keys.h b/src/vconf-keys.h
new file mode 100644 (file)
index 0000000..e6fd766
--- /dev/null
+++ b/src/vconf-keys.h
@@ -0,0 +1,2 @@
+#include "vconf-buxton-keys.h"
+

diff --git a/src/vconf.h b/src/vconf.h
new file mode 100644 (file)
index 0000000..cbf80d4
--- /dev/null
+++ b/src/vconf.h
@@ -0,0 +1 @@
+#include "vconf-buxton.h"