aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2012-07-11 19:53:59 +0200
committerSebastien Bacher <seb128@ubuntu.com>2012-07-11 19:53:59 +0200
commit7a6621d316ea0825de80548f6d8db81e98f56099 (patch)
treef0348b62daae64b69ce9ae1390c2088267d1f9f4 /src/Makefile.am
parent58b72505bad696704ad01e749830196400339ad5 (diff)
parente1ec25c1ccc63162bcfefc0661fc61fac9f376d1 (diff)
downloadayatana-indicator-session-7a6621d316ea0825de80548f6d8db81e98f56099.tar.gz
ayatana-indicator-session-7a6621d316ea0825de80548f6d8db81e98f56099.tar.bz2
ayatana-indicator-session-7a6621d316ea0825de80548f6d8db81e98f56099.zip
releasing version 12.10.0-0ubuntu1
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am207
1 files changed, 102 insertions, 105 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index b29e8d4..7bc6306 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-
+CLEANFILES =
EXTRA_DIST =
libexec_PROGRAMS = \
@@ -13,75 +13,96 @@ endif
# Indicator Stuff
###################
+CLEANFILES += .libs/*.gcda .libs/*.gcno *.gcda *.gcno
+
sessionlibdir = $(INDICATORDIR)
sessionlib_LTLIBRARIES = libsession.la
libsession_la_SOURCES = \
indicator-session.c \
gen-session-dbus.xml.h \
- dbus-shared-names.h \
- dbusmenu-shared.h \
+ shared-names.h \
user-widget.c \
- user-widget.h \
- accounts-service-client.h \
- accounts-service-user-client.h
+ user-widget.h
libsession_la_CFLAGS = \
$(APPLET_CFLAGS) \
$(COVERAGE_CFLAGS) \
- -Wall -Werror \
+ -Wall -Wunused \
-DG_LOG_DOMAIN=\"Indicator-Session\"
libsession_la_LIBADD = $(APPLET_LIBS)
libsession_la_LDFLAGS = \
$(COVERAGE_LDFLAGS) \
-module -avoid-version
-consolekit-manager-client.h: $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml
- dbus-binding-tool \
- --prefix=_consolekit_manager_client \
- --mode=glib-client \
- --output=consolekit-manager-client.h \
- $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml
-
-consolekit-seat-client.h: $(srcdir)/org.freedesktop.ConsoleKit.Seat.xml
- dbus-binding-tool \
- --prefix=_consolekit_seat_client \
- --mode=glib-client \
- --output=consolekit-seat-client.h \
- $(srcdir)/org.freedesktop.ConsoleKit.Seat.xml
-
-consolekit-session-client.h: $(srcdir)/org.freedesktop.ConsoleKit.Session.xml
- dbus-binding-tool \
- --prefix=_consolekit_session_client \
- --mode=glib-client \
- --output=consolekit-session-client.h \
- $(srcdir)/org.freedesktop.ConsoleKit.Session.xml
-
-display-manager-client.h: $(srcdir)/display-manager.xml
- dbus-binding-tool \
- --prefix=_gdm_local_display_factory_client \
- --mode=glib-client \
- --output=display-manager-client.h \
- $(srcdir)/display-manager.xml
-
-accounts-service-client.h: $(srcdir)/accounts-service.xml
- dbus-binding-tool \
- --prefix=_accounts_service_client \
- --mode=glib-client \
- --output=accounts-service-client.h \
- $(srcdir)/accounts-service.xml
-
-accounts-service-user-client.h: $(srcdir)/accounts-service-user.xml
- dbus-binding-tool \
- --prefix=_accounts_service_user_client \
- --mode=glib-client \
- --output=accounts-service-user-client.h \
- $(srcdir)/accounts-service-user.xml
-
-upower-client.h: $(srcdir)/upower.xml
- dbus-binding-tool \
- --prefix=_upower_client \
- --mode=glib-client \
- --output=upower-client.h \
- $(srcdir)/upower.xml
+dbus_display_manager_sources = \
+ dbus-display-manager.c \
+ dbus-display-manager.h
+
+$(dbus_display_manager_sources): display-manager.xml
+ gdbus-codegen \
+ --interface-prefix org.freedesktop \
+ --generate-c-code dbus-display-manager \
+ $^
+
+dbus_consolekit_manager_sources = \
+ dbus-consolekit-manager.c \
+ dbus-consolekit-manager.h
+
+$(dbus_consolekit_manager_sources): org.freedesktop.ConsoleKit.Manager.xml
+ gdbus-codegen \
+ --interface-prefix org.freedesktop \
+ --generate-c-code dbus-consolekit-manager \
+ $^
+
+dbus_consolekit_seat_sources = \
+ dbus-consolekit-seat.c \
+ dbus-consolekit-seat.h
+
+$(dbus_consolekit_seat_sources): org.freedesktop.ConsoleKit.Seat.xml
+ gdbus-codegen \
+ --interface-prefix org.freedesktop \
+ --generate-c-code dbus-consolekit-seat \
+ $^
+
+dbus_consolekit_session_sources = \
+ dbus-consolekit-session.c \
+ dbus-consolekit-session.h
+
+$(dbus_consolekit_session_sources): org.freedesktop.ConsoleKit.Session.xml
+ gdbus-codegen \
+ --interface-prefix org.freedesktop \
+ --generate-c-code dbus-consolekit-session \
+ $^
+
+dbus_accounts_sources = \
+ dbus-accounts.c \
+ dbus-accounts.h
+
+$(dbus_accounts_sources): org.freedesktop.Accounts.xml
+ gdbus-codegen \
+ --interface-prefix org.freedesktop \
+ --generate-c-code dbus-accounts \
+ $^
+
+dbus_user_sources = \
+ dbus-user.c \
+ dbus-user.h
+
+$(dbus_user_sources): org.freedesktop.Accounts.User.xml
+ gdbus-codegen \
+ --interface-prefix org.freedesktop \
+ --generate-c-code dbus-user \
+ $^
+
+dbus_upower_sources = \
+ dbus-upower.c \
+ dbus-upower.h
+
+$(dbus_upower_sources): upower.xml
+ gdbus-codegen \
+ --interface-prefix org.freedesktop \
+ --generate-c-code dbus-upower \
+ --c-namespace DBus \
+ $^
gen-%.xml.c: %.xml
@echo "Building $@ from $<"
@@ -98,54 +119,32 @@ gen-%.xml.h: %.xml
#################
indicator_session_service_SOURCES = \
- lock-helper.c \
- lock-helper.h \
+ $(dbus_accounts_sources) \
+ $(dbus_consolekit_manager_sources) \
+ $(dbus_consolekit_seat_sources) \
+ $(dbus_consolekit_session_sources) \
+ $(dbus_display_manager_sources) \
+ $(dbus_upower_sources) \
+ $(dbus_user_sources) \
session-service.c \
session-dbus.c \
session-dbus.h \
gen-session-dbus.xml.c \
- dbusmenu-shared.h \
- settings-helper.c \
users-service-dbus.h \
users-service-dbus.c \
- user-menu-mgr.h \
- user-menu-mgr.c \
- device-menu-mgr.h \
- device-menu-mgr.c \
- sane-rules.h
-
-if BUILD_APT
-indicator_session_service_SOURCES += \
- apt-watcher.h \
- apt-watcher.c
-else
-EXTRA_DIST += \
- apt-watcher.h \
- apt-watcher.c
-endif
-
-if HAS_GUDEV
-indicator_session_service_SOURCES += \
- udev-mgr.h \
- udev-mgr.c
-else
-EXTRA_DIST += \
- udev-mgr.h \
- udev-mgr.c
-endif
+ session-menu-mgr.h \
+ session-menu-mgr.c
indicator_session_service_CFLAGS = \
$(SESSIONSERVICE_CFLAGS) \
$(GCONF_CFLAGS) \
-DLIBEXECDIR=\"$(libexecdir)\" \
- -Wall -Werror \
+ -Wall \
-DG_LOG_DOMAIN=\"Indicator-Session\" \
- $(GUDEV_CFLAGS) \
$(COVERAGE_CFLAGS)
indicator_session_service_LDADD = \
$(SESSIONSERVICE_LIBS) \
- $(GCONF_LIBS) \
- $(GUDEV_LIBS)
+ $(GCONF_LIBS)
indicator_session_service_LDFLAGS = \
$(COVERAGE_LDFLAGS)
@@ -155,9 +154,8 @@ indicator_session_service_LDFLAGS = \
if BUILD_GTKLOGOUTHELPER
gtk_logout_helper_SOURCES = \
+ $(dbus_consolekit_manager_sources) \
gtk-logout-helper.c \
- settings-helper.c \
- settings-helper.h \
dialog.c \
dialog.h
@@ -166,7 +164,7 @@ gtk_logout_helper_CFLAGS = \
$(GTKLOGOUTHELPER_CFLAGS) \
$(GCONF_CFLAGS) \
$(COVERAGE_CFLAGS) \
- -Wall -Werror \
+ -Wall \
-DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\""
gtk_logout_helper_LDADD = \
@@ -184,25 +182,24 @@ endif
###############
BUILT_SOURCES = \
- consolekit-manager-client.h \
- consolekit-seat-client.h \
- consolekit-session-client.h \
- display-manager-client.h \
+ $(dbus_accounts_sources) \
+ $(dbus_consolekit_manager_sources) \
+ $(dbus_consolekit_seat_sources) \
+ $(dbus_consolekit_session_sources) \
+ $(dbus_display_manager_sources) \
+ $(dbus_upower_sources) \
+ $(dbus_user_sources) \
gen-session-dbus.xml.c \
- gen-session-dbus.xml.h \
- upower-client.h \
- accounts-service-client.h \
- accounts-service-user-client.h
+ gen-session-dbus.xml.h
EXTRA_DIST += \
+ display-manager.xml \
+ org.freedesktop.Accounts.User.xml \
+ org.freedesktop.Accounts.xml \
org.freedesktop.ConsoleKit.Manager.xml \
org.freedesktop.ConsoleKit.Seat.xml \
org.freedesktop.ConsoleKit.Session.xml \
- display-manager.xml \
session-dbus.xml \
- upower.xml \
- accounts-service.xml \
- accounts-service-user.xml
+ upower.xml
-CLEANFILES = \
- $(BUILT_SOURCES)
+CLEANFILES += $(BUILT_SOURCES)