diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-03 15:49:41 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-03 15:49:41 -0600 |
| commit | 68d13604c069937cdb1e6cab3ecd54cfb45fc593 (patch) | |
| tree | 605c42d8e48bb36ce85844a72c721bb20569a107 /src | |
| parent | d9dd91ad86cfff9457140ee4debd68752e79a99c (diff) | |
| download | ayatana-indicator-session-68d13604c069937cdb1e6cab3ecd54cfb45fc593.tar.gz ayatana-indicator-session-68d13604c069937cdb1e6cab3ecd54cfb45fc593.tar.bz2 ayatana-indicator-session-68d13604c069937cdb1e6cab3ecd54cfb45fc593.zip | |
Flattening the build tree.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 31 | ||||
| -rw-r--r-- | src/dialog.c (renamed from src/gtk-dialog/dialog.c) | 0 | ||||
| -rw-r--r-- | src/dialog.h (renamed from src/gtk-dialog/dialog.h) | 0 | ||||
| -rw-r--r-- | src/gconf-helper.c (renamed from src/gtk-dialog/gconf-helper.c) | 0 | ||||
| -rw-r--r-- | src/gconf-helper.h (renamed from src/gtk-dialog/gconf-helper.h) | 0 | ||||
| -rw-r--r-- | src/gtk-dialog/Makefile.am | 13 | ||||
| -rw-r--r-- | src/gtk-logout-helper.c (renamed from src/gtk-dialog/gtk-logout-helper.c) | 0 | ||||
| -rw-r--r-- | src/session-service.c | 2 |
8 files changed, 29 insertions, 17 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a07c782..cd525bd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,7 @@ -SUBDIRS = gtk-dialog -libexec_PROGRAMS = indicator-session-service +libexec_PROGRAMS = \ + indicator-session-service \ + gtk-logout-helper ################### # Indicator Stuff @@ -50,13 +51,37 @@ indicator_session_service_SOURCES = \ lock-helper.h \ session-service.c \ dbusmenu-shared.h \ - gtk-dialog/gconf-helper.c \ + gconf-helper.c \ users-service-dbus.h \ users-service-dbus.c \ users-service-marshal.c indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS) +################# +# GTK Logout Stuff +################# + +gtk_logout_helper_SOURCES = \ + gtk-logout-helper.c \ + gconf-helper.c \ + gconf-helper.h \ + dialog.c \ + dialog.h + +gtk_logout_helper_CFLAGS = \ + $(SESSIONSERVICE_CFLAGS) \ + $(GTKLOGOUTHELPER_CFLAGS) \ + $(GCONF_CFLAGS) \ + -Wall -Werror \ + -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" + +gtk_logout_helper_LDADD = \ + $(SESSIONSERVICE_LIBS) \ + $(GTKLOGOUTHELPER_LIBS) \ + $(GCONF_LIBS) + + ############### # Other Stuff ############### diff --git a/src/gtk-dialog/dialog.c b/src/dialog.c index 7e2347e..7e2347e 100644 --- a/src/gtk-dialog/dialog.c +++ b/src/dialog.c diff --git a/src/gtk-dialog/dialog.h b/src/dialog.h index 3240a8e..3240a8e 100644 --- a/src/gtk-dialog/dialog.h +++ b/src/dialog.h diff --git a/src/gtk-dialog/gconf-helper.c b/src/gconf-helper.c index 213592e..213592e 100644 --- a/src/gtk-dialog/gconf-helper.c +++ b/src/gconf-helper.c diff --git a/src/gtk-dialog/gconf-helper.h b/src/gconf-helper.h index 951bb0f..951bb0f 100644 --- a/src/gtk-dialog/gconf-helper.h +++ b/src/gconf-helper.h diff --git a/src/gtk-dialog/Makefile.am b/src/gtk-dialog/Makefile.am deleted file mode 100644 index 508beb2..0000000 --- a/src/gtk-dialog/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ - -libexec_PROGRAMS = gtk-logout-helper - -gtk_logout_helper_SOURCES = \ - gtk-logout-helper.c \ - gconf-helper.c \ - gconf-helper.h \ - dialog.c \ - dialog.h - -gtk_logout_helper_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" -gtk_logout_helper_LDADD = $(SESSIONSERVICE_LIBS) $(GTKLOGOUTHELPER_LIBS) $(GCONF_LIBS) - diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-logout-helper.c index bf37ca7..bf37ca7 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-logout-helper.c diff --git a/src/session-service.c b/src/session-service.c index 289bff8..af3c3e5 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -40,7 +40,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include "dbus-shared-names.h" #include "dbusmenu-shared.h" -#include "gtk-dialog/gconf-helper.h" +#include "gconf-helper.h" #include "users-service-dbus.h" #include "lock-helper.h" |