Removing the libappindicator directory to make things simpler

16 files changed, 26 insertions, 26 deletions

diff --git a/bindings/python/appindicator.override b/bindings/python/appindicator.override
index a01a9a6..b252994 100644
--- a/bindings/python/appindicator.override
+++ b/bindings/python/appindicator.override
@@ -28,8 +28,8 @@ License version 3 and version 2.1 along with this program.  If not, see
 %%
 headers
 #include <Python.h>
-#include "../src/libappindicator/app-indicator.h"
-#include "../src/libappindicator/app-indicator-enum-types.h"
+#include "../src/app-indicator.h"
+#include "../src/app-indicator-enum-types.h"
 #include <glib.h>
 #include "pygobject.h"
 #include "pyglib.h"
diff --git a/configure.ac b/configure.ac
index dfffa00..eab3411 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,7 @@ AC_MSG_RESULT($PYGTK_CODEGEN)
 AC_OUTPUT([
 Makefile
 src/Makefile
-src/libappindicator/appindicator-0.1.pc
+src/appindicator-0.1.pc
 bindings/Makefile
 bindings/mono/Makefile
 bindings/mono/appindicator-sharp.dll.config
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 1292f4d..3aedd60 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -22,7 +22,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../src/libappindicator
+DOC_SOURCE_DIR=../../src
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()"
@@ -50,8 +50,8 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/src/libappindicator/*.h
-CFILE_GLOB=$(top_srcdir)/src/libappindicator/*.c
+HFILE_GLOB=$(top_srcdir)/src/*.h
+CFILE_GLOB=$(top_srcdir)/src/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -75,7 +75,7 @@ expand_content_files=
 # signals and properties.
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/libappindicator $(INDICATOR_CFLAGS)
+GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(INDICATOR_CFLAGS)
 GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la 
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/example/simple-client.c b/example/simple-client.c
index a698b48..fbcaaaa 100644
--- a/example/simple-client.c
+++ b/example/simple-client.c
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "libappindicator/app-indicator.h"
+#include "app-indicator.h"
 #include "libdbusmenu-glib/server.h"
 #include "libdbusmenu-glib/menuitem.h"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 9f2771e..d8599d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 CLEANFILES =
 DISTCLEANFILES =
 BUILT_SOURCES =
-EXTRA_DIST = libappindicator/appindicator-0.1.pc.in
+EXTRA_DIST = appindicator-0.1.pc.in
 
 include $(top_srcdir)/Makefile.am.enum
 include $(top_srcdir)/Makefile.am.marshal
@@ -61,14 +61,14 @@ glib_marshal_prefix = _application_service_marshal
 # Library
 ##################################
 
-pkgconfig_DATA = libappindicator/appindicator-0.1.pc
+pkgconfig_DATA = appindicator-0.1.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-glib_enum_h = libappindicator/app-indicator-enum-types.h
-glib_enum_c = libappindicator/app-indicator-enum-types.gen.c
+glib_enum_h = app-indicator-enum-types.h
+glib_enum_c = app-indicator-enum-types.gen.c
 glib_enum_headers = $(libappindicator_headers)
 
-libappindicator/app-indicator-enum-types.c: libappindicator/app-indicator-enum-types.gen.c
+app-indicator-enum-types.c: app-indicator-enum-types.gen.c
 	sed -e "s|\"passive\"|\"Passive\"|" \
 	    -e "s|\"active\"|\"Active\"|" \
 	    -e "s|\"attention\"|\"NeedsAttention\"|" \
@@ -78,7 +78,7 @@ libappindicator/app-indicator-enum-types.c: libappindicator/app-indicator-enum-t
 	    -e "s|\"hardware\"|\"Hardware\"|" \
 	    -e "s|\"other\"|\"Other\"|" \
 	       $< > $@
-DISTCLEANFILES += libappindicator/app-indicator-enum-types.c
+DISTCLEANFILES += app-indicator-enum-types.c
 
 lib_LTLIBRARIES = \
 	libappindicator.la
@@ -86,7 +86,7 @@ lib_LTLIBRARIES = \
 libappindicatorincludedir=$(includedir)/libappindicator-0.1/libappindicator
 
 libappindicator_headers = \
-	$(srcdir)/libappindicator/app-indicator.h
+	$(srcdir)/app-indicator.h
 
 libappindicatorinclude_HEADERS = \
 	$(libappindicator_headers) \
@@ -94,10 +94,10 @@ libappindicatorinclude_HEADERS = \
 
 libappindicator_la_SOURCES = \
 	$(libappindicator_headers) \
-	libappindicator/app-indicator-enum-types.c \
+	app-indicator-enum-types.c \
 	notification-watcher-client.h \
 	notification-item-server.h \
-	libappindicator/app-indicator.c
+	app-indicator.c
 
 libappindicator_la_LDFLAGS = \
 	-version-info 0:0:0 \
diff --git a/src/libappindicator/app-indicator-enum-types.gen.c.in b/src/app-indicator-enum-types.gen.c.in
index 449f3fc..6a647b8 100644
--- a/src/libappindicator/app-indicator-enum-types.gen.c.in
+++ b/src/app-indicator-enum-types.gen.c.in
@@ -27,7 +27,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 <http://www.gnu.org/licenses/>
 */
 
-#include "libappindicator/app-indicator-enum-types.h"
+#include "app-indicator-enum-types.h"
 
 /*** END file-header ***/
 
diff --git a/src/libappindicator/app-indicator-enum-types.h.in b/src/app-indicator-enum-types.h.in
index da3bf98..da3bf98 100644
--- a/src/libappindicator/app-indicator-enum-types.h.in
+++ b/src/app-indicator-enum-types.h.in
diff --git a/src/libappindicator/app-indicator.c b/src/app-indicator.c
index 132e279..6ac48c7 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/app-indicator.c
@@ -35,8 +35,8 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-gtk/client.h>
 
-#include "libappindicator/app-indicator.h"
-#include "libappindicator/app-indicator-enum-types.h"
+#include "app-indicator.h"
+#include "app-indicator-enum-types.h"
 
 #include "notification-item-server.h"
 #include "notification-watcher-client.h"
diff --git a/src/libappindicator/app-indicator.h b/src/app-indicator.h
index 549ab35..549ab35 100644
--- a/src/libappindicator/app-indicator.h
+++ b/src/app-indicator.h
diff --git a/src/libappindicator/appindicator-0.1.pc.in b/src/appindicator-0.1.pc.in
index b80fded..b80fded 100644
--- a/src/libappindicator/appindicator-0.1.pc.in
+++ b/src/appindicator-0.1.pc.in
diff --git a/tests/test-libappindicator-dbus-client.c b/tests/test-libappindicator-dbus-client.c
index f5482aa..1500213 100644
--- a/tests/test-libappindicator-dbus-client.c
+++ b/tests/test-libappindicator-dbus-client.c
@@ -25,7 +25,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <libappindicator/app-indicator.h>
+#include <app-indicator.h>
 #include "test-defines.h"
 
 #include "../src/dbus-shared.h"
diff --git a/tests/test-libappindicator-dbus-server.c b/tests/test-libappindicator-dbus-server.c
index 2d68950..995d49b 100644
--- a/tests/test-libappindicator-dbus-server.c
+++ b/tests/test-libappindicator-dbus-server.c
@@ -24,7 +24,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <gtk/gtk.h>
-#include <libappindicator/app-indicator.h>
+#include <app-indicator.h>
 #include "test-defines.h"
 
 static GMainLoop * mainloop = NULL;
diff --git a/tests/test-libappindicator-fallback-item.c b/tests/test-libappindicator-fallback-item.c
index 9fd1b45..426b6a6 100644
--- a/tests/test-libappindicator-fallback-item.c
+++ b/tests/test-libappindicator-fallback-item.c
@@ -2,7 +2,7 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
-#include <libappindicator/app-indicator.h>
+#include <app-indicator.h>
 
 #define TEST_LIBAPPINDICATOR_FALLBACK_ITEM_TYPE            (test_libappindicator_fallback_item_get_type ())
 #define TEST_LIBAPPINDICATOR_FALLBACK_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_LIBAPPINDICATOR_FALLBACK_ITEM_TYPE, TestLibappindicatorFallbackItem))
diff --git a/tests/test-libappindicator-status-server.c b/tests/test-libappindicator-status-server.c
index 79b1759..8cd5571 100644
--- a/tests/test-libappindicator-status-server.c
+++ b/tests/test-libappindicator-status-server.c
@@ -25,7 +25,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <glib.h>
-#include <libappindicator/app-indicator.h>
+#include <app-indicator.h>
 
 static GMainLoop * mainloop = NULL;
 static gboolean active = FALSE;
diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c
index c987a8f..86879b3 100644
--- a/tests/test-libappindicator.c
+++ b/tests/test-libappindicator.c
@@ -23,7 +23,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libappindicator/app-indicator.h>
+#include <app-indicator.h>
 
 void
 test_libappindicator_prop_signals_status_helper (AppIndicator * ci, gchar * status, gboolean * signalactivated)
diff --git a/tests/test-simple-app.c b/tests/test-simple-app.c
index f5957c8..d60d9b9 100644
--- a/tests/test-simple-app.c
+++ b/tests/test-simple-app.c
@@ -24,7 +24,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <dbus/dbus-glib-lowlevel.h>
 #include <glib.h>
 #include <libdbusmenu-glib/server.h>
-#include <libappindicator/app-indicator.h>
+#include <app-indicator.h>
 
 static GMainLoop * mainloop = NULL;