diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2012-02-08 15:12:47 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2012-02-08 15:12:47 -0500 |
| commit | 4eacd253f0fd5cb22a6c12dbf58126eb14c95bde (patch) | |
| tree | 27c93878367ff2c04a9b9482b718b71ef8652857 /src/Makefile.am | |
| parent | 6c05bbbd892c117777b11662b7e86c0d201398ec (diff) | |
| parent | fb82208c7c5a593eb89f1a53174978b562fcdae7 (diff) | |
| download | ayatana-indicator-session-4eacd253f0fd5cb22a6c12dbf58126eb14c95bde.tar.gz ayatana-indicator-session-4eacd253f0fd5cb22a6c12dbf58126eb14c95bde.tar.bz2 ayatana-indicator-session-4eacd253f0fd5cb22a6c12dbf58126eb14c95bde.zip | |
* New upstream release.
* Screensaver code cleanup
* Fix ordering of items on request
* Removing GOA support
* Fix GTK3 Box Deprecation
* Updating to dbusmenu 0.5.90
* Making the gtk logout helper and apt optional build time choices
* Add name hints to the indicators
* bump version for release
* Drop debian/patches/01-remove-dead-gss-handling.patch: Upstream
* debian/control: Updating dbusmenu dep to 0.5.90
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index dba0a9e..afee66c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,11 @@ libexec_PROGRAMS = \ - indicator-session-service \ + indicator-session-service + +if BUILD_GTKLOGOUTHELPER +libexec_PROGRAMS += \ gtk-logout-helper +endif ################### # Indicator Stuff @@ -103,13 +107,18 @@ indicator_session_service_SOURCES = \ user-menu-mgr.c \ device-menu-mgr.h \ device-menu-mgr.c \ - apt-watcher.h \ - apt-watcher.c \ - apt-transaction.h \ - apt-transaction.c \ udev-mgr.h \ udev-mgr.c \ sane-rules.h + +if BUILD_APT +indicator_session_service_SOURCES += \ + apt-watcher.h \ + apt-watcher.c \ + apt-transaction.h \ + apt-transaction.c +endif + indicator_session_service_CFLAGS = \ $(SESSIONSERVICE_CFLAGS) \ $(GCONF_CFLAGS) \ @@ -124,6 +133,7 @@ indicator_session_service_LDADD = \ # GTK Logout Stuff ################# +if BUILD_GTKLOGOUTHELPER gtk_logout_helper_SOURCES = \ gtk-logout-helper.c \ settings-helper.c \ @@ -142,6 +152,7 @@ gtk_logout_helper_LDADD = \ $(SESSIONSERVICE_LIBS) \ $(GTKLOGOUTHELPER_LIBS) \ $(GCONF_LIBS) +endif ############### |