[gnome-bluetooth] applet: Move library within the applet dir

[Bastien Nocera <hadess src gnome org>]

commit f6d2a546093ccee6217508749be4dfef7056078b
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Oct 27 20:54:50 2010 +0100

    applet: Move library within the applet dir

 applet/{lib/Makefile.am => Makefile-lib.am} |    0
 applet/Makefile.am                          |   10 +++++-----
 applet/agent.c                              |    3 +--
 applet/agent.h                              |    2 +-
 applet/{lib => }/bluetooth-applet.c         |    0
 applet/{lib => }/bluetooth-applet.h         |    0
 applet/main.c                               |    2 +-
 applet/{lib => }/marshal.list               |    0
 applet/test-agentdialog.c                   |    2 +-
 configure.ac                                |    1 -
 10 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/applet/lib/Makefile.am b/applet/Makefile-lib.am
similarity index 100%
rename from applet/lib/Makefile.am
rename to applet/Makefile-lib.am
diff --git a/applet/Makefile.am b/applet/Makefile.am
index f5841b2..5eb3e7b 100644
--- a/applet/Makefile.am
+++ b/applet/Makefile.am
@@ -1,20 +1,20 @@
-SUBDIRS = lib
+include Makefile-lib.am
 
 bin_PROGRAMS = bluetooth-applet
 
 bluetooth_applet_SOURCES = main.c notify.h notify.c agent.h agent.c
 
-bluetooth_applet_LDADD = $(top_builddir)/lib/libgnome-bluetooth.la $(builddir)/lib/libgnome-bluetooth-applet.la $(APPLET_LIBS)
+bluetooth_applet_LDADD = $(top_builddir)/lib/libgnome-bluetooth.la $(builddir)/libgnome-bluetooth-applet.la $(APPLET_LIBS)
 
 noinst_PROGRAMS = test-agentdialog test-icon
 
 test_agentdialog_SOURCES = test-agentdialog.c notify.h notify.c
-test_agentdialog_LDADD = $(builddir)/lib/libgnome-bluetooth-applet.la $(APPLET_LIBS)
+test_agentdialog_LDADD = $(builddir)/libgnome-bluetooth-applet.la $(APPLET_LIBS)
 
 test_icon_SOURCES = test-icon.c notify.h notify.c
 test_icon_LDADD = $(APPLET_LIBS)
 
-AM_CFLAGS = $(APPLET_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\""
+AM_CFLAGS += $(APPLET_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\""
 
 INCLUDES = -I$(top_srcdir)/lib
 
@@ -32,7 +32,7 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(autostart_DATA)
+CLEANFILES += $(autostart_DATA)
 
 EXTRA_DIST = $(man_MANS) $(autostart_in_in_files) $(ui_DATA)
 
diff --git a/applet/agent.c b/applet/agent.c
index f667f50..f56283a 100644
--- a/applet/agent.c
+++ b/applet/agent.c
@@ -31,8 +31,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <lib/bluetooth-applet.h>
-
+#include "bluetooth-applet.h"
 #include "notify.h"
 #include "agent.h"
 
diff --git a/applet/agent.h b/applet/agent.h
index aa99f91..8c6471f 100644
--- a/applet/agent.h
+++ b/applet/agent.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include <lib/bluetooth-applet.h>
+#include <bluetooth-applet.h>
 
 int setup_agents(BluetoothApplet* applet);
 
diff --git a/applet/lib/bluetooth-applet.c b/applet/bluetooth-applet.c
similarity index 100%
rename from applet/lib/bluetooth-applet.c
rename to applet/bluetooth-applet.c
diff --git a/applet/lib/bluetooth-applet.h b/applet/bluetooth-applet.h
similarity index 100%
rename from applet/lib/bluetooth-applet.h
rename to applet/bluetooth-applet.h
diff --git a/applet/main.c b/applet/main.c
index c5d8fe1..1bb84bb 100644
--- a/applet/main.c
+++ b/applet/main.c
@@ -29,9 +29,9 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <lib/bluetooth-applet.h>
 #include <bluetooth-chooser.h>
 
+#include "bluetooth-applet.h"
 #include "notify.h"
 #include "agent.h"
 
diff --git a/applet/lib/marshal.list b/applet/marshal.list
similarity index 100%
rename from applet/lib/marshal.list
rename to applet/marshal.list
diff --git a/applet/test-agentdialog.c b/applet/test-agentdialog.c
index 7d2acdf..04a5d38 100644
--- a/applet/test-agentdialog.c
+++ b/applet/test-agentdialog.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include <lib/bluetooth-applet.h>
+#include "bluetooth-applet.h"
 #include "agent.c"
 #include "notify.h"
 
diff --git a/configure.ac b/configure.ac
index ea5bcfa..505f819 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,6 @@ AC_OUTPUT(Makefile
 	  icons/Makefile
 	  lib/Makefile
 	  lib/plugins/Makefile
-	  applet/lib/Makefile
 	  applet/Makefile
 	  applet/bluetooth-applet.desktop.in
 	  properties/Makefile