[Xfce4-commits] <xfc:master> move de headers out of de sub tree

[Bo Lorensen]

Updating branch refs/heads/master
         to 75823972840bbf8cc863904f1a8757fa20bd1401 (commit)
       from 561bd8eb9b6fd8557c8824fd5e0b91c4454938b4 (commit)

commit 75823972840bbf8cc863904f1a8757fa20bd1401
Author: Bo Lorensen <bl at lue.dk>
Date:   Mon Nov 16 22:40:54 2009 +0100

    move de headers out of de sub tree

 debian/libxfcde-dev.install           |    8 ++++----
 libXFCde/xfc/panel/Makefile.am        |    2 +-
 libXFCde/xfc/panel/inline/Makefile.am |    2 +-
 libXFCde/xfc/ui/Makefile.am           |    2 +-
 libXFCde/xfc/ui/inline/Makefile.am    |    2 +-
 libXFCde/xfc/utils/Makefile.am        |    2 +-
 libXFCde/xfc/utils/inline/Makefile.am |    2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/libxfcde-dev.install b/debian/libxfcde-dev.install
index 298240d..db744a0 100644
--- a/debian/libxfcde-dev.install
+++ b/debian/libxfcde-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/include/xfce4/xfc/de/ui/*.hh
-debian/tmp/usr/include/xfce4/xfc/de/ui/inline/*.inl
-debian/tmp/usr/include/xfce4/xfc/de/utils/*.hh
-debian/tmp/usr/include/xfce4/xfc/de/utils/inline/*.inl
+debian/tmp/usr/include/xfce4/xfc/ui/*.hh
+debian/tmp/usr/include/xfce4/xfc/ui/inline/*.inl
+debian/tmp/usr/include/xfce4/xfc/utils/*.hh
+debian/tmp/usr/include/xfce4/xfc/utils/inline/*.inl
 debian/tmp/usr/lib/pkgconfig/xfcde-*.pc
diff --git a/libXFCde/xfc/panel/Makefile.am b/libXFCde/xfc/panel/Makefile.am
index 79abc20..a3412b4 100644
--- a/libXFCde/xfc/panel/Makefile.am
+++ b/libXFCde/xfc/panel/Makefile.am
@@ -8,7 +8,7 @@ hh_sources =\
 cc_sources =\
  panel.cc
 
-library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/de/panel
+library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/panel
 library_include_HEADERS = $(hh_sources)
 
 INCLUDES = -I$(top_builddir)/libXFCde -I$(top_builddir)/libXFCcore 
diff --git a/libXFCde/xfc/panel/inline/Makefile.am b/libXFCde/xfc/panel/inline/Makefile.am
index d834214..f4dac4c 100644
--- a/libXFCde/xfc/panel/inline/Makefile.am
+++ b/libXFCde/xfc/panel/inline/Makefile.am
@@ -1,6 +1,6 @@
 inline_sources = panel.inl
 
-library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/de/panel
+library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/panel
 
 inline_includedir = $(library_includedir)/inline
 inline_include_HEADERS = $(inline_sources)
diff --git a/libXFCde/xfc/ui/Makefile.am b/libXFCde/xfc/ui/Makefile.am
index dae0554..44c8843 100644
--- a/libXFCde/xfc/ui/Makefile.am
+++ b/libXFCde/xfc/ui/Makefile.am
@@ -8,7 +8,7 @@ hh_sources =\
 cc_sources =\
  dialogs.cc
 
-library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/de/ui
+library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/ui
 library_include_HEADERS = $(hh_sources)
 
 INCLUDES = -I$(top_builddir)/libXFCde -I$(top_builddir)/libXFCcore -I$(top_builddir)/libXFCui
diff --git a/libXFCde/xfc/ui/inline/Makefile.am b/libXFCde/xfc/ui/inline/Makefile.am
index 0dd03b4..38cfc96 100644
--- a/libXFCde/xfc/ui/inline/Makefile.am
+++ b/libXFCde/xfc/ui/inline/Makefile.am
@@ -1,6 +1,6 @@
 inline_sources = dialog.inl
 
-library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/de/ui
+library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/ui
 
 inline_includedir = $(library_includedir)/inline
 inline_include_HEADERS = $(inline_sources)
diff --git a/libXFCde/xfc/utils/Makefile.am b/libXFCde/xfc/utils/Makefile.am
index 857005f..c086d90 100644
--- a/libXFCde/xfc/utils/Makefile.am
+++ b/libXFCde/xfc/utils/Makefile.am
@@ -8,7 +8,7 @@ hh_sources =\
 cc_sources =\
  config.cc
 
-library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/de/utils
+library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/utils
 library_include_HEADERS = $(hh_sources)
 
 INCLUDES = -I$(top_builddir)/libXFCde -I$(top_builddir)/libXFCcore 
diff --git a/libXFCde/xfc/utils/inline/Makefile.am b/libXFCde/xfc/utils/inline/Makefile.am
index 6551aa8..c6792a4 100644
--- a/libXFCde/xfc/utils/inline/Makefile.am
+++ b/libXFCde/xfc/utils/inline/Makefile.am
@@ -1,6 +1,6 @@
 inline_sources = config.inl
 
-library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/de/utils
+library_includedir=$(includedir)/$(XFCEDIR)/$(XFC_LIBRARY_NAME)/utils
 
 inline_includedir = $(library_includedir)/inline
 inline_include_HEADERS = $(inline_sources)