Merge branch 'sunweaver-pr/fix-make-distcheck'

Attributes GH PR #22: https://github.com/AyatanaIndicators/ayatana-ido/pull/22

5 files changed, 149 insertions, 64 deletions

diff --git a/Makefile.am b/Makefile.am
index a9afbed..427354e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,4 +47,6 @@ DISTCLEANFILES = \
 
 EXTRA_DIST = libayatana-ido3.pc.in
 
+DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc --disable-silent-rules
+
 include $(top_srcdir)/Makefile.am.coverage
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..2c2a3ab
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,66 @@
+Overview of changes in ayatana-ido 0.8.2
+
+  - Add Travis support (CI builds).
+
+Overview of changes in ayatana-ido 0.8.1
+
+  - idoswitchmenuitem.c: Fix setting the initial state for the switch.
+  - idoswitchmenuitem.c: Pass the switch activation state in the action
+    signal.
+  - idobasicmenuitem.c: Add optional markup to the basic menu item.
+
+Overview of changes in ayatana-ido 0.8.0
+
+  - src/Makefile.am: Export ayatanamenuitemfactory.h as part of the
+    public API, needed by indicator-ng.c in libayatana-indicator.
+  - Replace x-canonical attributes solely used by Ayatana Indicators.
+  - Drop IDO Message Dialog.
+  - Centre playback menu item spinner/Pad application menu item label.
+  - Centre volume control/Stretch calendar horizontally.
+
+Overview of changes in ayatana-ido 0.5.0
+
+  - src/idomessagedialog.c: Mark G_GNUC_{BEGIN,END}_IGNORE_DEPRECATIONS
+    wrapping around gtk_dialog_get_action_area() with a FIXME.
+  - Updated colour getter for playback control.
+  - Some refactoring to avoid warnings.
+  - Remove ayatana-private.h.
+  - src/Makefile.am: Don't choke with FTBFS on every future deprecation
+    warning. Drop -Werror from CPPFLAGS.
+  - gtk_widget_get_state is deprecated.
+
+Overview of changes in ayatana-ido 0.4.90
+
+  - Port from Glib's g_object_newv to g_object_new_with_properties.
+  - Avoid deprecated g_type_class_add_private.
+
+Overview of changes in ayatana-ido 0.4.4
+
+  - libayatana-ido3.pc.in: Fix Name: field in .pc file.
+  - Revert "libayatana-ido3.pc.in: Unversion name of .pc pkg-config
+    file (plus fix Name: field in .pc file).
+
+Overview of changes in ayatana-ido 0.4.3
+
+  - libayatana-ido3.pc.in: Unversion name of .pc pkg-config file (plus
+    fix Name: field in .pc file).
+  - autogen.sh: Fix PKG_NAME (ido -> ayatana-ido).
+
+Overview of changes in ayatana-ido 0.4.2
+
+  - tests/Makefile.am: Fix static lib name (libido -> libayatana-ido).
+  - libayatana-ido3.pc.in: Fix pkg-config name (libido -> libayatana-ido).
+  - Makefile.am: Drop distcheck features.
+
+Overview of changes in ayatana-ido 0.4.1
+
+  - configure.ac: Let AC_CONFIG_SRCDIR point to src/libayatana-ido.h.
+  - src/libido.h: Drop empty file (artifact of fork).
+
+Overview of changes in ayatana-ido 0.4.1
+
+  - Build system: Drop remnants of GTK-2+ support.
+  - IdoCalendarMenuItem: disconnect from parent signals on item
+    destruction (LP: #1506427)
+  - build system: Switch to mate-common.
+  - Fork ayatana-ido from Ubuntu's ido shared library.
diff --git a/configure.ac b/configure.ac
index 86c55de..e02d9d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,7 @@ AC_PATH_PROG([VALA_API_GEN], [vapigen])
 dnl = Google Test Framework ===================================================
 
 dnl xorg-gtest also provides gtest.
-CHECK_XORG_GTEST
+# CHECK_XORG_GTEST
 
 dnl = GTK Doc Check ===========================================================
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 12a11c3..268e2fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 CLEANFILES =
 
 lib_LTLIBRARIES = libayatana-ido3-0.4.la
@@ -7,7 +9,8 @@ ido_built_public_sources =		\
 
 stamp_files =				\
 	idotypebuiltins.h		\
-	idotypebuiltins.c
+	idotypebuiltins.c		\
+	$(NULL)
 
 sources_h =				\
 	ayatanamenuitemfactory.h	\
@@ -20,7 +23,7 @@ sources_h =				\
 	idousermenuitem.h		\
 	idoappointmentmenuitem.h	\
 	idobasicmenuitem.h		\
-    idoremovablemenuitem.h \
+	idoremovablemenuitem.h		\
 	idoprogressmenuitem.h		\
 	idotimestampmenuitem.h		\
 	idolocationmenuitem.h		\
@@ -31,47 +34,10 @@ sources_h =				\
 	idoplaybackmenuitem.h		\
 	idoapplicationmenuitem.h 	\
 	idodetaillabel.h		\
-	idosourcemenuitem.h
-
-EXTRA_DIST =				\
-	ido.list			\
-	idotypebuiltins.h.template	\
-	idotypebuiltins.c.template
-
+	idosourcemenuitem.h		\
+	$(NULL)
 
-idotypebuiltins.h: stamp-idotypebuiltins.h
-
-stamp-idotypebuiltins.h: $(sources_h)
-	( cd $(srcdir) && $(GLIB_MKENUMS) --template idotypebuiltins.h.template \
-		$(sources_h) ) >> xgen-gtbh \
-	&& (cmp -s xgen-gtbh idotypebuiltins.h || cp xgen-gtbh idotypebuiltins.h ) \
-	&& rm -f xgen-gtbh && echo timestamp > $(@F)
-
-idotypebuiltins.c: stamp-idotypebuiltins.h
-	( cd $(srcdir) && $(GLIB_MKENUMS) --template idotypebuiltins.c.template \
-		$(sources_h) ) > xgen-gtbc \
-	&& cp xgen-gtbc idotypebuiltins.c && rm -f xgen-gtbc
-
-INCLUDES =				\
-	-I$(srcdir)			\
-	-I$(top_srcdir)			\
-	-DG_LOG_DOMAIN=\"IDO\"		\
-	-DPREFIX=\"$(prefix)"\"		\
-	-DLIBDIR=\"$(libdir)"\"		\
-	-DG_DISABLE_DEPRECATED		\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
-	-DGDK_DISABLE_DEPRECATED
-
-AM_CPPFLAGS =				\
-	$(GCC_FLAGS)			\
-	$(GTK_CFLAGS)			\
-	$(MAINTAINER_CFLAGS)    \
-	-Wall -Wextra -Wno-unused-parameter -Wno-error=deprecated-declarations
-
-AM_CFLAGS =                             \
-	$(COVERAGE_CFLAGS)
-
-libayatana_ido_0_4_la_SOURCES =		\
+sources_c =				\
 	ayatanamenuitemfactory.c	\
 	libayatana-ido.c		\
 	idotypebuiltins.c		\
@@ -89,13 +55,58 @@ libayatana_ido_0_4_la_SOURCES =		\
 	idoplaybackmenuitem.c		\
 	idoappointmentmenuitem.c	\
 	idobasicmenuitem.c		\
-    idoremovablemenuitem.c \
+	idoremovablemenuitem.c		\
 	idoprogressmenuitem.c		\
 	idotimestampmenuitem.c		\
 	idolocationmenuitem.c		\
 	idoapplicationmenuitem.c	\
 	idodetaillabel.c		\
-	idosourcemenuitem.c
+	idosourcemenuitem.c		\
+	$(NULL)
+
+EXTRA_DIST =				\
+	ido.list			\
+	idotypebuiltins.h.template	\
+	idotypebuiltins.c.template	\
+	$(NULL)
+
+idotypebuiltins.h: stamp-idotypebuiltins.h
+
+stamp-idotypebuiltins.h: $(sources_h)
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template idotypebuiltins.h.template		\
+		$(sources_h) ) >> xgen-gtbh						\
+	&& (cmp -s xgen-gtbh idotypebuiltins.h || cp xgen-gtbh idotypebuiltins.h )	\
+	&& rm -f xgen-gtbh && echo timestamp > $(@F)					\
+	$(NULL)
+
+idotypebuiltins.c: stamp-idotypebuiltins.h
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template idotypebuiltins.c.template \
+		$(sources_h) ) > xgen-gtbc \
+	&& cp xgen-gtbc idotypebuiltins.c && rm -f xgen-gtbc
+
+AM_CPPFLAGS =									\
+	-I$(srcdir)								\
+	-I$(top_srcdir)								\
+	-DG_LOG_DOMAIN=\"IDO\"							\
+	-DPREFIX=\"$(prefix)"\"							\
+	-DLIBDIR=\"$(libdir)"\"							\
+	-DG_DISABLE_DEPRECATED							\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED						\
+	-DGDK_DISABLE_DEPRECATED						\
+	$(GCC_FLAGS)								\
+	$(GTK_CFLAGS)								\
+	$(MAINTAINER_CFLAGS)							\
+	-Wall -Wextra -Wno-unused-parameter -Wno-error=deprecated-declarations	\
+	$(NULL)
+
+AM_CFLAGS =				\
+	$(COVERAGE_CFLAGS)		\
+	$(NULL)
+
+libayatana_ido_0_4_la_SOURCES =		\
+	$(sources_h)			\
+	$(sources_c)			\
+	$(NULL)
 
 libayatana_ido3_0_4_la_SOURCES = $(libayatana_ido_0_4_la_SOURCES)
 
@@ -109,30 +120,34 @@ libayatana_idoinclude_HEADERS =		\
 	idoscalemenuitem.h		\
 	idoswitchmenuitem.h		\
 	idotimeline.h			\
-	libayatana-ido.h
+	libayatana-ido.h		\
+	$(NULL)
 
 libayatana_ido_0_4_la_LIBADD = $(GTK_LIBS) $(LIBM)
-libayatana_ido_0_4_la_LDFLAGS =                 \
-	$(GTK_LT_LDFLAGS)               \
-	$(COVERAGE_LDFLAGS)	\
-	-no-undefined \
-	-export-symbols-regex "^[^_].*"
+libayatana_ido_0_4_la_LDFLAGS =			\
+	$(GTK_LT_LDFLAGS)			\
+	$(COVERAGE_LDFLAGS)			\
+	-no-undefined				\
+	-export-symbols-regex "^[^_].*"		\
+	$(NULL)
+
 libayatana_ido3_0_4_la_LIBADD = $(libayatana_ido_0_4_la_LIBADD)
-libayatana_ido3_0_4_la_LDFLAGS =                \
-	$(libayatana_ido_0_4_la_LDFLAGS)
+libayatana_ido3_0_4_la_LDFLAGS = $(libayatana_ido_0_4_la_LDFLAGS)
 
 DISTCLEANFILES =			\
 	Makefile.in			\
 	stamp-idotypebuiltins.h		\
 	idotypebuiltins.h		\
-	idotypebuiltins.c
+	idotypebuiltins.c		\
+	$(NULL)
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = \
-        --symbol-prefix=ido \
-        --warn-all \
-        --identifier-prefix=Ido
+INTROSPECTION_SCANNER_ARGS =		\
+	--symbol-prefix=ido		\
+	--warn-all			\
+	--identifier-prefix=Ido		\
+	$(NULL)
 
 if HAVE_INTROSPECTION
 
@@ -147,7 +162,9 @@ AyatanaIdo3_0_4_gir_FILES = \
 	idoscalemenuitem.h		\
 	idoswitchmenuitem.h		\
 	idotimeline.h			\
-	$(libayatana_ido_0_4_la_SOURCES)
+	$(sources_c)			\
+	$(NULL)
+
 AyatanaIdo3_0_4_gir_NAMESPACE = AyatanaIdo3
 AyatanaIdo3_0_4_gir_VERSION = 0.4
 AyatanaIdo3_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
@@ -170,8 +187,8 @@ vapidir = $(datadir)/vala/vapi
 vapi_DATA = AyatanaIdo3-0.4.vapi
 
 AyatanaIdo3-0.4.vapi: AyatanaIdo3-0.4.gir
-	$(VALA_API_GEN) --library=AyatanaIdo3-0.4 \
-			--pkg gtk+-3.0 \
+	$(VALA_API_GEN) --library=AyatanaIdo3-0.4	\
+			--pkg gtk+-3.0			\
 			$<
 
 CLEANFILES += $(vapi_DATA)
diff --git a/src/libayatana-ido.h b/src/libayatana-ido.h
index 37a2eee..7eb8ae1 100644
--- a/src/libayatana-ido.h
+++ b/src/libayatana-ido.h
@@ -26,9 +26,9 @@
 #ifndef __IDO__
 #define __IDO__
 
-#include <libayatana-ido/idocalendarmenuitem.h>
-#include <libayatana-ido/idoscalemenuitem.h>
-#include <libayatana-ido/idoentrymenuitem.h>
+#include "idocalendarmenuitem.h"
+#include "idoscalemenuitem.h"
+#include "idoentrymenuitem.h"
 
 void ido_init (void);