diff options
| author | Ted Gould <ted@gould.cx> | 2010-06-01 11:10:26 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-06-01 11:10:26 -0500 |
| commit | 36519944273d601aeba1b778a2f5aead96293cfd (patch) | |
| tree | 7dddbe70262b8e41202f3f4bf10335c4c06e2d35 | |
| parent | e0ddc2dbf98ad7411b9a29b34bfd99f94f1ce74e (diff) | |
| parent | 1b748b2921b4b552dddd2cf0c58acbd5304541a5 (diff) | |
| download | libayatana-appindicator-36519944273d601aeba1b778a2f5aead96293cfd.tar.gz libayatana-appindicator-36519944273d601aeba1b778a2f5aead96293cfd.tar.bz2 libayatana-appindicator-36519944273d601aeba1b778a2f5aead96293cfd.zip | |
Distcheck fixes
| -rw-r--r-- | docs/reference/Makefile.am | 20 | ||||
| -rw-r--r-- | src/Makefile.am | 32 |
2 files changed, 37 insertions, 15 deletions
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 3aedd60..10d8b2a 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -50,12 +50,26 @@ 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/*.h -CFILE_GLOB=$(top_srcdir)/src/*.c +HFILE_GLOB=$(top_srcdir)/src/app-indicator*.h +CFILE_GLOB=$(top_srcdir)/src/app-indicator*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES=app-indicator-enum-types.h application-service-appstore.h application-service-client.h application-service-marshal.h application-service-server.h application-service-watcher.h dbus-properties-client.h dbus-properties-server.h dbus-shared.h notification-item-client.h notification-item-server.h notification-watcher-client.h notification-watcher-server.h +IGNORE_HFILES= \ + app-indicator-enum-types.h \ + application-service-appstore.h \ + application-service-client.h \ + application-service-lru-file.h \ + application-service-marshal.h \ + application-service-server.h \ + application-service-watcher.h \ + dbus-properties-client.h \ + dbus-properties-server.h \ + dbus-shared.h \ + notification-item-client.h \ + notification-item-server.h \ + notification-watcher-client.h \ + notification-watcher-server.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png diff --git a/src/Makefile.am b/src/Makefile.am index 8662179..787ba2f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,22 +32,25 @@ libapplication_la_LDFLAGS = -module -avoid-version libexec_PROGRAMS = indicator-application-service +BUILT_SOURCES += \ + application-service-server.h \ + application-service-marshal.h \ + application-service-marshal.c \ + dbus-properties-client.h \ + notification-item-client.h \ + notification-watcher-server.h + indicator_application_service_SOURCES = \ application-service.c \ application-service-appstore.h \ application-service-appstore.c \ application-service-lru-file.h \ application-service-lru-file.c \ - application-service-marshal.h \ application-service-marshal.c \ - application-service-server.h \ application-service-watcher.h \ application-service-watcher.c \ app-indicator-enum-types.c \ - dbus-properties-client.h \ - dbus-shared.h \ - notification-item-client.h \ - notification-watcher-server.h + dbus-shared.h indicator_application_service_CFLAGS = \ $(INDICATOR_CFLAGS) \ -Wall -Werror \ @@ -84,11 +87,13 @@ libappindicatorinclude_HEADERS = \ $(libappindicator_headers) \ $(glib_enum_h) +BUILT_SOURCES += \ + notification-watcher-client.h \ + notification-item-server.h + libappindicator_la_SOURCES = \ $(libappindicator_headers) \ app-indicator-enum-types.c \ - notification-watcher-client.h \ - notification-item-server.h \ app-indicator.c libappindicator_la_LDFLAGS = \ @@ -109,6 +114,7 @@ libappindicator_la_LIBADD = \ ################################## DBUS_SPECS = \ + dbus-properties.xml \ application-service.xml \ notification-item.xml \ notification-watcher.xml @@ -148,15 +154,17 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) if HAVE_INTROSPECTION -introspection_sources = $(libappindicatorinclude_HEADERS) +introspection_sources = \ + $(addprefix $(srcdir)/,$(libappindicator_headers)) \ + $(addprefix $(top_builddir)/src/, $(glib_enum_h)) -AppIndicator-0.1.gir: libappindicator.la +AppIndicator-0.1.gir: libappindicator.la $(glib_enum_h) AppIndicator_0_1_gir_INCLUDES = \ GObject-2.0 \ Gtk-2.0 -AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) +AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir) -I$(top_builddir)/src AppIndicator_0_1_gir_LIBS = libappindicator.la -AppIndicator_0_1_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) +AppIndicator_0_1_gir_FILES = $(introspection_sources) INTROSPECTION_GIRS += AppIndicator-0.1.gir |