Eobj: Improved config.h a bit and fixed a pkg-config error.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/PROTO/eobj@70236 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57d241c..2de7169 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 2.6)
 project(eobj)
-set(EOBJ_VERSION_MAJOR 0)
-set(EOBJ_VERSION_MINOR 1)
-set(EOBJ_VERSION_MICRO 0)
-set(EOBJ_VERSION ${EOBJ_VERSION_MAJOR}.${EOBJ_VERSION_MINOR}.${EOBJ_VERSION_MICRO})
+set(VMAJ 0)
+set(VMIN 1)
+set(VMIC 0)
+set(PACKAGE_VERSION ${VMAJ}.${VMIN}.${VMIC})
 
 set(PACKAGE ${CMAKE_PROJECT_NAME})
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
@@ -55,6 +55,7 @@ add_subdirectory(doc)
 CONFIGURE_FILE(
    "${PROJECT_SOURCE_DIR}/eobj.pc.in"
    "${PROJECT_BINARY_DIR}/eobj.pc"
+   @ONLY
    )
 
 INSTALL(FILES "${PROJECT_BINARY_DIR}/eobj.pc"

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index aeccf65..332ef03 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -1,9 +1,9 @@
-#define PACKAGE "@CMAKE_PROJECT_NAME@"
+#define PACKAGE "@PACKAGE@"
 #define PACKAGE_NAME PACKAGE
-#define VERSION "@EOBJ_VERSION@"
-#define VMAJ @EOBJ_VERSION_MAJOR@
-#define VMIN @EOBJ_VERSION_MINOR@
-#define VMIC @EOBJ_VERSION_MICRO@
+#define VERSION "@PACKAGE_VERSION@"
+#define VMAJ @VMAJ@
+#define VMIN @VMIN@
+#define VMIC @VMIC@
 
 #cmakedefine HAVE___ATTRIBUTE__
 #ifdef HAVE___ATTRIBUTE__

diff --git a/eobj.pc.in b/eobj.pc.in
index 09759ec..61f1697 100644 (file)
--- a/eobj.pc.in
+++ b/eobj.pc.in
@@ -5,9 +5,9 @@ includedir=${prefix}/include
 
 Name: Eobj
 Description: EFL's generic object system library.
-Version: @EOBJ_VERSION@
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -leobj
 Libs.private:
-Cflags: -I${includedir}/eobj-@EOBJ_VERSION_MAJOR@
+Cflags: -I${includedir}/eobj-@VMAJ@
 
 ~