[Xfce4-commits] <xfce4-taskbar-plugin:master> Integerated utility code into the build, hacked some defines to make the build work

[Gearoid Murphy]

Updating branch refs/heads/master
         to 1b80346e44c57e9f1d7b36e2604e595c7907f6ff (commit)
       from 5676b08b1980a48b5d9b6d6b7fbdecfeca2fbff3 (commit)

commit 1b80346e44c57e9f1d7b36e2604e595c7907f6ff
Author: Gearoid Murphy <gearoid at murphy.com>
Date:   Sat Oct 13 18:30:53 2012 +0100

    Integerated utility code into the build, hacked some defines to make the build work

 Makefile                                  |    9 +++++----
 common/panel-dbus.h => panel-dbus.h       |    0
 common/panel-debug.c => panel-debug.c     |    6 ++----
 common/panel-debug.h => panel-debug.h     |    0
 common/panel-private.h => panel-private.h |    0
 common/panel-utils.c => panel-utils.c     |    4 ++--
 common/panel-utils.h => panel-utils.h     |    0
 common/panel-xfconf.c => panel-xfconf.c   |    7 ++-----
 common/panel-xfconf.h => panel-xfconf.h   |    0
 taskbar-widget.c                          |    4 ++--
 taskbar.c                                 |    6 +++---
 11 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index b8fc69c..f8ea116 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
-CFLAGS=-fPIC -g -I. `pkg-config --cflags-only-I gtk+-2.0 exo-1 libwnck-1.0 libxfce4panel-1.0 libxfce4ui-1 libxfconf-0 gtkhotkey-1.0`
-#CFLAGS=-fPIC -O3 -I. `pkg-config --cflags-only-I gtk+-2.0 exo-1 libwnck-1.0 libxfce4panel-1.0 libxfce4ui-1 libxfconf-0 gtkhotkey-1.0`
+PP=-DPACKAGE_NAME="\"Taskbar\"" -DLC_MESSAGES="\"C\"" -DHELPDIR="\"/usr/share/doc/xfce4-taskbar/\""
+CFLAGS=-fPIC $(PP) -g -I. `pkg-config --cflags-only-I gtk+-2.0 exo-1 libwnck-1.0 libxfce4panel-1.0 libxfce4ui-1 libxfconf-0 gtkhotkey-1.0`
+#CFLAGS=-fPIC $(PP) -O3 -I. `pkg-config --cflags-only-I gtk+-2.0 exo-1 libwnck-1.0 libxfce4panel-1.0 libxfce4ui-1 libxfconf-0 gtkhotkey-1.0`
 LINKFLAGS=`pkg-config --libs gtk+-2.0 exo-1 libwnck-1.0 libxfce4panel-1.0 libxfce4ui-1 libxfconf-0 gobject-2.0 gtk+-x11-2.0 glib-2.0 gtkhotkey-1.0`
 
-OBJ=taskbar.o taskbar-widget.o hotkeys.o
+OBJ=taskbar.o taskbar-widget.o hotkeys.o panel-debug.o panel-utils.o panel-xfconf.o
 
 all:libtaskbar.so
 
@@ -26,7 +27,7 @@ clean:
 	rm -f *.o *.so
 
 devenv:
-	sudo apt-get install libgtk2.0-dev libexo-1-dev libxfce4ui-1-dev libxfce4util-dev libxfcegui4-dev libxfconf-0-dev xfce4-panel-dev libwnck-dev libgtkhotkey-dev
+	sudo apt-get install libgtk2.0-dev libexo-1-dev libxfce4ui-1-dev libxfce4util-dev libxfcegui4-dev libxfconf-0-dev xfce4-panel-dev libwnck-dev libgtkhotkey-dev libxfce4ui-1-dev
 
 restart:
 	xfce4-panel -r
diff --git a/common/panel-dbus.h b/panel-dbus.h
similarity index 100%
rename from common/panel-dbus.h
rename to panel-dbus.h
diff --git a/common/panel-debug.c b/panel-debug.c
similarity index 98%
rename from common/panel-debug.c
rename to panel-debug.c
index 595169f..973e294 100644
--- a/common/panel-debug.c
+++ b/panel-debug.c
@@ -25,10 +25,8 @@
 #endif
 
 #include <glib.h>
-#include <common/panel-debug.h>
-#include <common/panel-private.h>
-
-
+#include <panel-debug.h>
+#include <panel-private.h>
 
 static PanelDebugFlag panel_debug_flags = 0;
 
diff --git a/common/panel-debug.h b/panel-debug.h
similarity index 100%
rename from common/panel-debug.h
rename to panel-debug.h
diff --git a/common/panel-private.h b/panel-private.h
similarity index 100%
rename from common/panel-private.h
rename to panel-private.h
diff --git a/common/panel-utils.c b/panel-utils.c
similarity index 99%
rename from common/panel-utils.c
rename to panel-utils.c
index e8c5d7c..95e107a 100644
--- a/common/panel-utils.c
+++ b/panel-utils.c
@@ -27,8 +27,8 @@
 #include <libxfce4ui/libxfce4ui.h>
 #include <exo/exo.h>
 
-#include <common/panel-private.h>
-#include <common/panel-utils.h>
+#include <panel-private.h>
+#include <panel-utils.h>
 
 
 
diff --git a/common/panel-utils.h b/panel-utils.h
similarity index 100%
rename from common/panel-utils.h
rename to panel-utils.h
diff --git a/common/panel-xfconf.c b/panel-xfconf.c
similarity index 98%
rename from common/panel-xfconf.c
rename to panel-xfconf.c
index 0aee653..d9a6b2a 100644
--- a/common/panel-xfconf.c
+++ b/panel-xfconf.c
@@ -21,13 +21,10 @@
 #endif
 
 #include <dbus/dbus-glib.h>
-
-#include <common/panel-private.h>
-#include <common/panel-xfconf.h>
+#include <panel-private.h>
+#include <panel-xfconf.h>
 #include <libxfce4panel/xfce-panel-macros.h>
 
-
-
 static void
 panel_properties_store_value (XfconfChannel *channel,
                               const gchar   *xfconf_property,
diff --git a/common/panel-xfconf.h b/panel-xfconf.h
similarity index 100%
rename from common/panel-xfconf.h
rename to panel-xfconf.h
diff --git a/taskbar-widget.c b/taskbar-widget.c
index 0703bbb..7f80f7c 100644
--- a/taskbar-widget.c
+++ b/taskbar-widget.c
@@ -15,8 +15,8 @@
 #include <exo/exo.h>
 #include <libwnck/libwnck.h>
 #include <libxfce4panel/libxfce4panel.h>
-#include <common/panel-private.h>
-#include <common/panel-debug.h>
+#include <panel-private.h>
+#include <panel-debug.h>
 
 #ifdef GDK_WINDOWING_X11
 #include <X11/Xlib.h>
diff --git a/taskbar.c b/taskbar.c
index bdd7ca1..c4debdb 100644
--- a/taskbar.c
+++ b/taskbar.c
@@ -5,9 +5,9 @@
 
 #include <exo/exo.h>
 #include <libxfce4ui/libxfce4ui.h>
-#include <common/panel-xfconf.h>
-#include <common/panel-utils.h>
-#include <common/panel-private.h>
+#include <panel-xfconf.h>
+#include <panel-utils.h>
+#include <panel-private.h>
 #include <libxfce4panel/libxfce4panel.h>
 
 #include "taskbar-widget.h"