[Xfce4-commits] <xfc:master> One day I may learn to understand GIT :-)
Bo Lorensen
noreply at xfce.org
Thu Sep 22 22:32:01 CEST 2011
Updating branch refs/heads/master
to df22a2224dbdc8a670b6dcab421cd93d4f95984e (commit)
from 608ef55d1ddce59f5cf87d39ba6e49856826b322 (commit)
commit df22a2224dbdc8a670b6dcab421cd93d4f95984e
Author: Bo Lorensen <bl at lue.dk>
Date: Thu Sep 22 22:30:37 2011 +0200
One day I may learn to understand GIT :-)
CMakeLists.txt | 7 ++++-
core/CMakeLists.txt | 6 +++++
core/xfc/CMakeLists.txt | 2 +-
core/xfccore.pc.in | 12 +++++-----
de/CMakeLists.txt | 5 ++++
de/xfc/CMakeLists.txt | 9 +++----
de/xfc/ui/CMakeLists.txt | 8 ++++++-
de/xfc/utils/CMakeLists.txt | 9 ++++---
de/xfcde.pc.in | 13 +++++------
debian/libxfc-doc.install | 2 +-
debian/libxfccore-dev.install | 1 -
debian/libxfccore.install | 2 +-
debian/libxfcde.install | 2 +-
debian/libxfcglade-dev.install | 3 +-
debian/libxfcglade.install | 2 +-
debian/libxfcsourceview-dev.install | 1 -
debian/libxfcsourceview.install | 2 +-
debian/libxfcui-dev.install | 4 ---
debian/libxfcui.install | 2 +-
debian/rules | 3 +-
demos/xfc-demo/CMakeLists.txt | 39 ++++++++++++++++++++++++++++----
docs/CMakeFiles.txt | 9 -------
docs/index.html.in | 2 +-
docs/reference/Doxyfile.in | 4 +-
glade/CMakeLists.txt | 8 ++++++
glade/xfc/CMakeLists.txt | 8 +++++-
glade/xfc/glade/CMakeLists.txt | 3 +-
glade/xfc/glade/inline/CMakeLists.txt | 2 +-
glade/xfc/glade/xml.cc | 2 +-
glade/xfcglade.pc.in | 14 ++++++------
sourceview/CMakeLists.txt | 8 ++++++
ui/CMakeLists.txt | 5 ++++
ui/xfc/CMakeLists.txt | 2 +-
ui/xfc/atk/CMakeLists.txt | 2 +-
ui/xfc/cairo/CMakeLists.txt | 2 +-
ui/xfc/gdk-pixbuf/CMakeLists.txt | 2 +-
ui/xfc/gdk/CMakeLists.txt | 2 +-
ui/xfc/gtk/CMakeLists.txt | 2 +-
ui/xfc/pango/CMakeLists.txt | 2 +-
ui/xfcui.pc.in | 14 ++++++------
40 files changed, 142 insertions(+), 85 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee2d853..1d34379 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,12 +10,15 @@ SET( XFC_MICRO_VERSION 0 )
SET( XFC_VERSION "${XFC_MAJOR_VERSION}.${XFC_MINOR_VERSION}.${XFC_MICRO_VERSION}")
+SET( XFCEDIR xfce4 )
+
ADD_SUBDIRECTORY( core )
ADD_SUBDIRECTORY( ui )
-#ADD_SUBDIRECTORY( glade )
+ADD_SUBDIRECTORY( glade )
ADD_SUBDIRECTORY( de )
-#ADD_SUBDIRECTORY( sourceview )
+ADD_SUBDIRECTORY( sourceview )
ADD_SUBDIRECTORY( demos )
ADD_SUBDIRECTORY( examples )
+ADD_SUBDIRECTORY( docs )
CONFIGURE_FILE( xfc-config.h.in xfc-config.h )
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index ba17d11..ed9c382 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -7,3 +7,9 @@ pkg_search_module( GMOD REQUIRED gmodule-2.0)
pkg_search_module( GTHR REQUIRED gthread-2.0)
ADD_SUBDIRECTORY( xfc )
+
+CONFIGURE_FILE( xfccore.pc.in xfccore-${XFC_VERSION}.pc @ONLY )
+
+INSTALL( FILES xfccore-${XFC_VERSION}.pc
+ DESTINATION lib/pkgconfig )
+
diff --git a/core/xfc/CMakeLists.txt b/core/xfc/CMakeLists.txt
index 0ac61a6..d82aa50 100644
--- a/core/xfc/CMakeLists.txt
+++ b/core/xfc/CMakeLists.txt
@@ -27,4 +27,4 @@ INSTALL( FILES
utfstring.hh
version.hh
xfccore.hh
- DESTINATION include/xfc)
+ DESTINATION include/xfce4/xfc)
diff --git a/core/xfccore.pc.in b/core/xfccore.pc.in
index 625082e..eaa8b03 100644
--- a/core/xfccore.pc.in
+++ b/core/xfccore.pc.in
@@ -1,13 +1,13 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
Name: Xfc-Core
Description: The Xfce Foundation Classes core library
-Version: @VERSION@
+Version: @XFC_VERSION@
Requires: glib-2.0 gobject-2.0 sigc++-2.0 gthread-2.0
-Libs: -L${libdir} -lXFCcore- at XFC_API_VERSION@
+Libs: -L${libdir} -lxfc_core
Cflags: -I${includedir}/@XFCEDIR@
diff --git a/de/CMakeLists.txt b/de/CMakeLists.txt
index 1eb7fe7..f695808 100644
--- a/de/CMakeLists.txt
+++ b/de/CMakeLists.txt
@@ -1,3 +1,8 @@
PROJECT( XFC_DE )
ADD_SUBDIRECTORY( xfc )
+
+CONFIGURE_FILE( xfcde.pc.in xfcde-${XFC_VERSION}.pc @ONLY )
+
+INSTALL( FILES xfcde-${XFC_VERSION}.pc
+ DESTINATION lib/pkgconfig )
diff --git a/de/xfc/CMakeLists.txt b/de/xfc/CMakeLists.txt
index 32319fc..8c0e5ab 100644
--- a/de/xfc/CMakeLists.txt
+++ b/de/xfc/CMakeLists.txt
@@ -1,3 +1,6 @@
+#ADD_SUBDIRECTORY( ui )
+#ADD_SUBDIRECTORY( panel )
+ADD_SUBDIRECTORY( utils )
pkg_search_module( XFCE_PANEL REQUIRED libxfce4panel-1.0 )
pkg_search_module( XFCE_UTILS REQUIRED libxfce4util-1.0 )
@@ -7,7 +10,7 @@ pkg_search_module( XFCE_CONF REQUIRED libxfconf-0 )
INCLUDE_DIRECTORIES( ${XFCE_UTILS_INCLUDE_DIRS} ${XFCE_CONF_INCLUDE_DIRS} ${XFCE_UI_INCLUDE_DIRS} )
INCLUDE_DIRECTORIES( ${XFC_DE_SOURCE_DIR} ${XFC_CORE_SOURCE_DIR} ${SIGC_INCLUDE_DIRS} ${XFCE_CONF_INCLUDE_DIRS} ${XFCE_UTIL_INCLUDE_DIRS})
-ADD_LIBRARY( xfc_de SHARED main.cc ${utils_src})
+ADD_LIBRARY( xfc_de SHARED main.cc ${utils_src} ${ui_src})
TARGET_LINK_LIBRARIES( xfc_de ${XFCE_UTILS_LIBRARIES} ${XFCE_CONF_LIBRARIES} ${XFCE_UI_LIBARIES})
SET_TARGET_PROPERTIES( xfc_de PROPERTIES VERSION ${XFC_VERSION} SOVERSION ${XFC_MAJOR_VERSION} )
@@ -15,7 +18,3 @@ SET_TARGET_PROPERTIES( xfc_de PROPERTIES VERSION ${XFC_VERSION} SOVERSION ${XFC_
INSTALL(TARGETS xfc_de
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib )
-
-#ADD_SUBDIRECTORY( ui )
-#ADD_SUBDIRECTORY( panel )
-ADD_SUBDIRECTORY( utils )
diff --git a/de/xfc/ui/CMakeLists.txt b/de/xfc/ui/CMakeLists.txt
index 83fa12d..4624026 100644
--- a/de/xfc/ui/CMakeLists.txt
+++ b/de/xfc/ui/CMakeLists.txt
@@ -1,3 +1,9 @@
+ADD_SUBDIRECTORY( inline )
+
INCLUDE_DIRECTORIES(${xfce_core_SOURCE_DIRS} ${XFCE_UI_INCLUDE_DIRS})
-ADD_LIBRARY(xfc_de_ui STATIC dialogs.cc)
+SET( ui_src ui/dialogs.cc PARENT_SCOPE)
+
+INSTALL( FILES
+ dialogs.hh
+ DESTINATION include/xfce4/xfc/ui)
diff --git a/de/xfc/utils/CMakeLists.txt b/de/xfc/utils/CMakeLists.txt
index ec5c27d..6383042 100644
--- a/de/xfc/utils/CMakeLists.txt
+++ b/de/xfc/utils/CMakeLists.txt
@@ -1,6 +1,7 @@
-SET( utils_src
- utils/config.cc )
+SET( utils_src utils/config.cc PARENT_SCOPE )
-INSTALL( FILES config.hh DESTINATION include/xfc/utils )
-INSTALL( FILES inline/config.inl DESTINATION include/xfc/utils/inline )
+INSTALL( FILES config.hh
+ DESTINATION include/xfce4/xfc/utils )
+INSTALL( FILES inline/config.inl
+ DESTINATION include/xfce4/xfc/utils/inline )
diff --git a/de/xfcde.pc.in b/de/xfcde.pc.in
index cf6636e..24f6197 100644
--- a/de/xfcde.pc.in
+++ b/de/xfcde.pc.in
@@ -1,12 +1,11 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
Name: Xfc-DesktopEnvironment
Description: The Xfce Foundation Classes desktop environment library
Version: @VERSION@
-Requires: glib-2.0 gobject-2.0 sigc++-2.0 gthread-2.0 libxfconf-0 libxfce4util-1.0 libxfce4panel-1.0 libxfcegui4-1.0
-Libs: -L${libdir} -lXFCcore- at XFC_API_VERSION@ -lXFCui- at XFC_API_VERSION@ -lXFCde- at XFC_API_VERSION@
+Requires: glib-2.0 gobject-2.0 sigc++-2.0 gthread-2.0 libxfconf-0 libxfce4util-1.0 libxfce4panel-1.0 xfccore- at XFC_VERSION@ xfcui- at XFC_VERSION@
+Libs: -L${libdir} -lxfc_core -lxfc_ui -lxfc_de
Cflags: -I${includedir}/@XFCEDIR@
-
diff --git a/debian/libxfc-doc.install b/debian/libxfc-doc.install
index 0064af7..f55b6f9 100644
--- a/debian/libxfc-doc.install
+++ b/debian/libxfc-doc.install
@@ -1 +1 @@
-debian/tmp/usr/share/doc/xfc-4.3/*
+debian/tmp/usr/share/doc/xfc-*/*
diff --git a/debian/libxfccore-dev.install b/debian/libxfccore-dev.install
index e275c73..8a92cd4 100644
--- a/debian/libxfccore-dev.install
+++ b/debian/libxfccore-dev.install
@@ -9,6 +9,5 @@ debian/tmp/usr/include/xfce4/xfc/version.hh
debian/tmp/usr/include/xfce4/xfc/xfccore.hh
debian/tmp/usr/include/xfce4/xfc/integerobject.hh
debian/tmp/usr/include/xfce4/xfc/glib/*.hh
-debian/tmp/usr/include/xfce4/xfc/glib/private/*.hh
debian/tmp/usr/include/xfce4/xfc/glib/inline/*.inl
debian/tmp/usr/lib/pkgconfig/xfccore-*.pc
diff --git a/debian/libxfccore.install b/debian/libxfccore.install
index cee5711..83cd932 100644
--- a/debian/libxfccore.install
+++ b/debian/libxfccore.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libXFCcore*.so*
+debian/tmp/usr/lib/libxfc_core*.so*
diff --git a/debian/libxfcde.install b/debian/libxfcde.install
index afec8e8..577296c 100644
--- a/debian/libxfcde.install
+++ b/debian/libxfcde.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libXFCde*.so*
+debian/tmp/usr/lib/libxfc_de*.so*
diff --git a/debian/libxfcglade-dev.install b/debian/libxfcglade-dev.install
index 98985f3..fe61586 100644
--- a/debian/libxfcglade-dev.install
+++ b/debian/libxfcglade-dev.install
@@ -1,5 +1,4 @@
debian/tmp/usr/include/xfce4/xfc/xfcglade.hh
debian/tmp/usr/include/xfce4/xfc/glade/*.hh
-debian/tmp/usr/include/xfce4/xfc/glade/private/*.hh
debian/tmp/usr/include/xfce4/xfc/glade/inline/*.inl
-debian/tmp/usr/lib/pkgconfig/xfcglade-4.3.pc
+debian/tmp/usr/lib/pkgconfig/xfcglade-*.pc
diff --git a/debian/libxfcglade.install b/debian/libxfcglade.install
index 9d767bb..065b4bd 100644
--- a/debian/libxfcglade.install
+++ b/debian/libxfcglade.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libXFCglade*.so*
+debian/tmp/usr/lib/libxfc_glade*.so*
diff --git a/debian/libxfcsourceview-dev.install b/debian/libxfcsourceview-dev.install
index 7b31eff..fe80eeb 100644
--- a/debian/libxfcsourceview-dev.install
+++ b/debian/libxfcsourceview-dev.install
@@ -1,3 +1,2 @@
debian/tmp/usr/include/xfce4/xfc/sourceview/*.hh
-debian/tmp/usr/include/xfce4/xfc/sourceview/private/*.hh
debian/tmp/usr/lib/pkgconfig/xfcsourceview-*.pc
diff --git a/debian/libxfcsourceview.install b/debian/libxfcsourceview.install
index 2800a62..7039367 100644
--- a/debian/libxfcsourceview.install
+++ b/debian/libxfcsourceview.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libXFCsourceview*.so.*
+debian/tmp/usr/lib/libxfc_sourceview*.so.*
diff --git a/debian/libxfcui-dev.install b/debian/libxfcui-dev.install
index 3ac8cd5..5fc7ca4 100644
--- a/debian/libxfcui-dev.install
+++ b/debian/libxfcui-dev.install
@@ -2,16 +2,12 @@ debian/tmp/usr/include/xfce4/xfc/main.hh
debian/tmp/usr/include/xfce4/xfc/ui.hh
debian/tmp/usr/include/xfce4/xfc/xfcui.hh
debian/tmp/usr/include/xfce4/xfc/atk/*.hh
-debian/tmp/usr/include/xfce4/xfc/atk/private/*.hh
debian/tmp/usr/include/xfce4/xfc/atk/inline/*.inl
debian/tmp/usr/include/xfce4/xfc/gdk/*.hh
-debian/tmp/usr/include/xfce4/xfc/gdk/private/*.hh
debian/tmp/usr/include/xfce4/xfc/gdk/inline/*.inl
debian/tmp/usr/include/xfce4/xfc/gdk-pixbuf/*.hh
-debian/tmp/usr/include/xfce4/xfc/gdk-pixbuf/private/*.hh
debian/tmp/usr/include/xfce4/xfc/gdk-pixbuf/inline/*.inl
debian/tmp/usr/include/xfce4/xfc/gtk/*.hh
-debian/tmp/usr/include/xfce4/xfc/gtk/private/*.hh
debian/tmp/usr/include/xfce4/xfc/gtk/inline/*.inl
debian/tmp/usr/include/xfce4/xfc/pango/*.hh
debian/tmp/usr/include/xfce4/xfc/pango/inline/*.inl
diff --git a/debian/libxfcui.install b/debian/libxfcui.install
index 8954145..78ae7d5 100644
--- a/debian/libxfcui.install
+++ b/debian/libxfcui.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libXFCui*.so*
+debian/tmp/usr/lib/libxfc_ui*.so*
diff --git a/debian/rules b/debian/rules
index 4e7f1aa..c847eb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,7 @@ clean:
# Add here commands to clean up after the build process.
-$(MAKE) clean
- find . -name CMakeFiles -exec rm -rf {} \;
+ -find . -name CMakeFiles -exec rm -rf {} \;
-rm CMakeCache.txt
dh_clean
@@ -89,6 +89,7 @@ binary-arch: build install
dh_compress
dh_fixperms
dh_installdeb
+ dh_makeshlibs
dh_shlibdeps
dh_gencontrol
dh_md5sums
diff --git a/demos/xfc-demo/CMakeLists.txt b/demos/xfc-demo/CMakeLists.txt
index baff764..8cd2e40 100644
--- a/demos/xfc-demo/CMakeLists.txt
+++ b/demos/xfc-demo/CMakeLists.txt
@@ -4,13 +4,42 @@ INCLUDE_DIRECTORIES( ${XFC_UI_SOURCE_DIR} ${XFC_CORE_SOURCE_DIR}
ADD_DEFINITIONS( -DDEMOCODEDIR="${XFC_DEMOS_SOURCE_DIR}/xfc-demo" )
-ADD_EXECUTABLE( xfc-demo main.cc demowindow.cc appwindow.cc button_box.cc changedisplay.cc clipboard.cc colorsel.cc
- dialog.cc drawingarea.cc entry_completion.cc expander.cc hypertext.cc iconview.cc images.cc
- menus.cc panes.cc pixbufs.cc rotated_text.cc sizegroup.cc stock_browser.cc textview.cc editable_cells.cc
- list_store.cc tree_store.cc ui_manager.cc)
+SET( demos
+ appwindow.cc
+ button_box.cc
+ changedisplay.cc
+ clipboard.cc
+ colorsel.cc
+ dialog.cc
+ drawingarea.cc
+ entry_completion.cc
+ expander.cc
+ hypertext.cc
+ iconview.cc
+ images.cc
+ menus.cc
+ panes.cc
+ pixbufs.cc
+ rotated_text.cc
+ sizegroup.cc
+ stock_browser.cc
+ textview.cc
+ editable_cells.cc
+ list_store.cc
+ tree_store.cc
+ ui_manager.cc)
+
+ADD_EXECUTABLE( xfc-demo main.cc demowindow.cc ${demos} )
TARGET_LINK_LIBRARIES( xfc-demo xfc_ui )
-SET( IMAGEFILES alphatest.png apple-red.png background.jpg floppybuddy.gif gnome-applets.png
+SET( images alphatest.png apple-red.png background.jpg floppybuddy.gif gnome-applets.png
gnome-calendar.png gnome-fs-directory.png gnome-foot.png gnome-gimp.png gnome-gmush.png gnome-gsame.png
gnome-fs-regular.png gnu-keys.png gtk-logo-rgb.gif)
+
+INSTALL( FILES ${demos} ${images}
+ DESTINATION share/xfce4/xfc/demos)
+
+INSTALL( TARGETS xfc-demo
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib)
diff --git a/docs/CMakeFiles.txt b/docs/CMakeFiles.txt
deleted file mode 100644
index 1f27c4e..0000000
--- a/docs/CMakeFiles.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-## xfc docs directory
-
-SUBDIRS = faq howto images tutorial @REFERENCE_SUBDIR@
-
-EXTRA_DIST = index.html.in README
-
-xfc_docs_DATA = index.html README
-
-xfc_docsdir = $(xfc_docdir)/docs
diff --git a/docs/index.html.in b/docs/index.html.in
index 4b37c1e..a5a941b 100644
--- a/docs/index.html.in
+++ b/docs/index.html.in
@@ -504,7 +504,7 @@ Development Team</font></td>
<td style="text-align: center;"> <a class="qindexF" href="index.html">Top</a></td>
<td style="white-space: nowrap; width: 33%; text-align: right;"><font size="-1">XFC
- at XFC_API_VERSION@</font> </td>
+ at XFC_VERSION@</font> </td>
</tr>
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index 234ec40..b36dcb8 100644
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -23,7 +23,7 @@ PROJECT_NAME = "XFC"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = "Version @XFC_API_VERSION@"
+PROJECT_NUMBER = "Version @XFC_VERSION@"
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
@@ -417,7 +417,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = ../../libXFCcore/xfc ../../libXFCui/xfc ../../libXFCglade/xfc ../../libXFCsourceview/xfc ../../libXFCde/xfc
+INPUT = ../../core/xfc ../../ui/xfc ../../glade/xfc ../../sourceview/xfc ../../de/xfc
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
diff --git a/glade/CMakeLists.txt b/glade/CMakeLists.txt
index 208427a..ccb7723 100644
--- a/glade/CMakeLists.txt
+++ b/glade/CMakeLists.txt
@@ -1 +1,9 @@
+PROJECT( XFC_GLADE )
+
ADD_SUBDIRECTORY( xfc )
+
+CONFIGURE_FILE( xfcglade.pc.in xfcglade-${XFC_VERSION}.pc @ONLY )
+
+INSTALL( FILES xfcglade-${XFC_VERSION}.pc
+ DESTINATION lib/pkgconfig )
+
diff --git a/glade/xfc/CMakeLists.txt b/glade/xfc/CMakeLists.txt
index 44524b7..0096bbb 100644
--- a/glade/xfc/CMakeLists.txt
+++ b/glade/xfc/CMakeLists.txt
@@ -1,10 +1,14 @@
## libXFCglade source directory
+pkg_search_module( GLADE REQUIRED libglade-2.0)
+
ADD_SUBDIRECTORY( glade )
-ADD_LIBRARY( xfc_glade ${glade_src} )
+INCLUDE_DIRECTORIES( ${GLADE_INCLUDE_DIRS} ${XFC_CORE_SOURCE_DIR} ${XFC_UI_SOURCE_DIR} ${SIGC_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${XFC_GLADE_SOURCE_DIR} )
+
+ADD_LIBRARY( xfc_glade SHARED ${glade_src} )
-TARGET_LINK_LIBRARIES( xfc_glade xfc_core xfc_ui ${GTK_LIBRARIES} )
+TARGET_LINK_LIBRARIES( xfc_glade xfc_core xfc_ui ${GLADE_LIBRARIES} )
SET_TARGET_PROPERTIES( xfc_glade PROPERTIES VERSION ${XFC_VERSION} SOVERSION ${XFC_MAJOR_VERSION} )
INSTALL(TARGETS xfc_glade
diff --git a/glade/xfc/glade/CMakeLists.txt b/glade/xfc/glade/CMakeLists.txt
index 7fdf3e6..4d18ae0 100644
--- a/glade/xfc/glade/CMakeLists.txt
+++ b/glade/xfc/glade/CMakeLists.txt
@@ -2,8 +2,7 @@
ADD_SUBDIRECTORY( inline )
-SET( glade_src
- glade/xml.cc )
+SET( glade_src glade/xml.cc PARENT_SCOPE)
INSTALL( FILES
glade.hh
diff --git a/glade/xfc/glade/inline/CMakeLists.txt b/glade/xfc/glade/inline/CMakeLists.txt
index b2f2a91..6a9d5f1 100644
--- a/glade/xfc/glade/inline/CMakeLists.txt
+++ b/glade/xfc/glade/inline/CMakeLists.txt
@@ -2,4 +2,4 @@
INSTALL( FILES
xml.inl
- DESTINATION include/xfce4/xfc/glade)
+ DESTINATION include/xfce4/xfc/glade/inline)
diff --git a/glade/xfc/glade/xml.cc b/glade/xfc/glade/xml.cc
index 39a92d5..93ea66c 100644
--- a/glade/xfc/glade/xml.cc
+++ b/glade/xfc/glade/xml.cc
@@ -20,7 +20,7 @@
#include "xml.hh"
#include "private/xmlclass.hh"
-#include "../../../libXFCui/xfc/gtk/widget.hh"
+#include "xfc/gtk/widget.hh"
using namespace Xfc;
diff --git a/glade/xfcglade.pc.in b/glade/xfcglade.pc.in
index c96bc92..90252ec 100644
--- a/glade/xfcglade.pc.in
+++ b/glade/xfcglade.pc.in
@@ -1,11 +1,11 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
Name: Xfc-Glade
Description: The Xfce Foundation Classes Glade library
-Version: @VERSION@
-Requires: libglade-2.0 xfcui- at XFC_API_VERSION@
-Libs: -L${libdir} -lXFCglade- at XFC_API_VERSION@
+Version: @XFC_VERSION@
+Requires: libglade-2.0 xfcui- at XFC_VERSION@
+Libs: -L${libdir} -lxfc_glade
Cflags: -I${includedir}/@XFCEDIR@
diff --git a/sourceview/CMakeLists.txt b/sourceview/CMakeLists.txt
index 208427a..8242c53 100644
--- a/sourceview/CMakeLists.txt
+++ b/sourceview/CMakeLists.txt
@@ -1 +1,9 @@
+PROJECT( XFC_SOURCEVIEW )
+
ADD_SUBDIRECTORY( xfc )
+
+CONFIGURE_FILE( xfcsourceview.pc.in xfcsourceview-${XFC_VERSION}.pc @ONLY )
+
+INSTALL( FILES xfcsourceview-${XFC_VERSION}.pc
+ DESTINATION lib/pkgconfig )
+
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 350b975..5a7e6ec 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -1,3 +1,8 @@
PROJECT( XFC_UI )
ADD_SUBDIRECTORY( xfc )
+
+CONFIGURE_FILE( xfcui.pc.in xfcui-${XFC_VERSION}.pc @ONLY )
+
+INSTALL( FILES xfcui-${XFC_VERSION}.pc
+ DESTINATION lib/pkgconfig )
diff --git a/ui/xfc/CMakeLists.txt b/ui/xfc/CMakeLists.txt
index ef34434..319bbcd 100644
--- a/ui/xfc/CMakeLists.txt
+++ b/ui/xfc/CMakeLists.txt
@@ -31,6 +31,6 @@ INSTALL( FILES
ui.hh
xfcui.hh
config.h
- DESTINATION include/xfc)
+ DESTINATION include/xfce4/xfc)
#SET_TARGET_PROPERTIES( xfc_ui PROPERTIES LINK_INTERFACE_LIBRARIES "")
diff --git a/ui/xfc/atk/CMakeLists.txt b/ui/xfc/atk/CMakeLists.txt
index bbee347..411ae6c 100755
--- a/ui/xfc/atk/CMakeLists.txt
+++ b/ui/xfc/atk/CMakeLists.txt
@@ -63,4 +63,4 @@ INSTALL( FILES
textsignals.hh
util.hh
value.hh
- DESTINATION include/xfc/atk)
+ DESTINATION include/xfce4/xfc/atk)
diff --git a/ui/xfc/cairo/CMakeLists.txt b/ui/xfc/cairo/CMakeLists.txt
index cc03c2b..7e9d7ea 100644
--- a/ui/xfc/cairo/CMakeLists.txt
+++ b/ui/xfc/cairo/CMakeLists.txt
@@ -20,4 +20,4 @@ INSTALL( FILES
image_surface.hh
pdf_surface.hh
svg_surface.hh
- DESTINATION include/xfc/cairo)
+ DESTINATION include/xfce4/xfc/cairo)
diff --git a/ui/xfc/gdk-pixbuf/CMakeLists.txt b/ui/xfc/gdk-pixbuf/CMakeLists.txt
index 8036d65..d7878fe 100644
--- a/ui/xfc/gdk-pixbuf/CMakeLists.txt
+++ b/ui/xfc/gdk-pixbuf/CMakeLists.txt
@@ -19,4 +19,4 @@ INSTALL( FILES
pixbuf-animation.hh
pixbuf-loader.hh
pixbuf-loadersignals.hh
- DESTINATION include/xfc/gdk-pixbuf )
+ DESTINATION include/xfce4/xfc/gdk-pixbuf )
diff --git a/ui/xfc/gdk/CMakeLists.txt b/ui/xfc/gdk/CMakeLists.txt
index 3686788..f267033 100644
--- a/ui/xfc/gdk/CMakeLists.txt
+++ b/ui/xfc/gdk/CMakeLists.txt
@@ -39,4 +39,4 @@ INSTALL( FILES
types.hh
visual.hh
window.hh
- DESTINATION include/xfc/gdk)
+ DESTINATION include/xfce4/xfc/gdk)
diff --git a/ui/xfc/gtk/CMakeLists.txt b/ui/xfc/gtk/CMakeLists.txt
index 8150a6f..f9977ef 100755
--- a/ui/xfc/gtk/CMakeLists.txt
+++ b/ui/xfc/gtk/CMakeLists.txt
@@ -346,4 +346,4 @@ INSTALL( FILES
widgetsignals.hh
window.hh
windowsignals.hh
- DESTINATION include/xfc/gtk)
+ DESTINATION include/xfce4/xfc/gtk)
diff --git a/ui/xfc/pango/CMakeLists.txt b/ui/xfc/pango/CMakeLists.txt
index c5333d3..c81409e 100644
--- a/ui/xfc/pango/CMakeLists.txt
+++ b/ui/xfc/pango/CMakeLists.txt
@@ -38,4 +38,4 @@ INSTALL( FILES
script.hh
tabs.hh
types.hh
- DESTINATION include/xfc/pango)
+ DESTINATION include/xfce4/xfc/pango)
diff --git a/ui/xfcui.pc.in b/ui/xfcui.pc.in
index ab5354a..877e784 100644
--- a/ui/xfcui.pc.in
+++ b/ui/xfcui.pc.in
@@ -1,11 +1,11 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
Name: XFC UI
Description: The Xfce Foundation Classes user interface library
-Version: @VERSION@
-Requires: gtk+-2.0 xfccore- at XFC_API_VERSION@
-Libs: -L${libdir} -lXFCui- at XFC_API_VERSION@
+Version: @XFC_VERSION@
+Requires: gtk+-2.0 xfccore- at XFC_VERSION@
+Libs: -L${libdir} -lxfc_ui
Cflags: -I${includedir}/@XFCEDIR@
More information about the Xfce4-commits
mailing list