2 files changed, 23 insertions, 29 deletions
diff --git a/packages/xfce/xfwm4.inc b/packages/xfce/xfwm4.inc
deleted file mode 100644
index 211853aa18..0000000000
--- a/packages/xfce/xfwm4.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-# xfwm4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION="XFCE4 Window Manager"
-SECTION = "x11/wm"
-inherit xfce
-
-FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
-
-DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
-RDEPENDS = "xfwm4-theme-default"
-
-
-EXTRA_OECONF += " --enable-startup-notification"
-
-PACKAGES_DYNAMIC = "xfwm4-theme-*"
-
-python populate_packages_prepend () {
-	themedir = bb.data.expand('${datadir}/themes', d)
-	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
-}
-
-PACKAGES += " ${PN}-mcs-plugins"
-
-FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so"
-
diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb
index 1d8a176d8a..211853aa18 100644
--- a/packages/xfce/xfwm4_4.4.1.bb
+++ b/packages/xfce/xfwm4_4.4.1.bb
@@ -2,5 +2,26 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see COPYING.MIT)
 
-FILE_PR ="r1"
-require ${PN}.inc
+DESCRIPTION="XFCE4 Window Manager"
+SECTION = "x11/wm"
+inherit xfce
+
+FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
+
+DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
+RDEPENDS = "xfwm4-theme-default"
+
+
+EXTRA_OECONF += " --enable-startup-notification"
+
+PACKAGES_DYNAMIC = "xfwm4-theme-*"
+
+python populate_packages_prepend () {
+	themedir = bb.data.expand('${datadir}/themes', d)
+	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
+}
+
+PACKAGES += " ${PN}-mcs-plugins"
+
+FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so"
+