diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-08-14 17:03:00 -0400 |
|---|---|---|
| committer | William Jon McCann <mccann@jhu.edu> | 2007-08-14 17:03:00 -0400 |
| commit | e56a95f64c9c9f57adebf6cb3e6c88790cec40e4 (patch) | |
| tree | 0cb197ebc031483cb9eaa74d41801b6bda6887a3 | |
| parent | dc97e6caabc9932922d26f3400424626462f5ad2 (diff) | |
move tools out of linux subdirectory since they apparently work on solaris
| -rw-r--r-- | tools/.gitignore | 3 | ||||
| -rw-r--r-- | tools/Makefile.am | 36 | ||||
| -rw-r--r-- | tools/ck-collect-session-info.c (renamed from tools/linux/ck-collect-session-info.c) | 0 | ||||
| -rw-r--r-- | tools/ck-get-x11-display-device.c (renamed from tools/linux/ck-get-x11-display-device.c) | 0 | ||||
| -rw-r--r-- | tools/ck-get-x11-server-pid.c (renamed from tools/linux/ck-get-x11-server-pid.c) | 0 | ||||
| -rw-r--r-- | tools/linux/Makefile.am | 32 |
6 files changed, 39 insertions, 32 deletions
diff --git a/tools/.gitignore b/tools/.gitignore index 93cc472..1f920e5 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -6,3 +6,6 @@ Makefile Makefile.in ck-list-sessions +ck-collect-session-info +ck-get-x11-display-device +ck-get-x11-server-pid diff --git a/tools/Makefile.am b/tools/Makefile.am index b7f515a..98783eb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -17,6 +17,7 @@ DIST_SUBDIRS = \ INCLUDES = \ -I. \ -I$(srcdir) \ + -I$(top_srcdir)/src \ $(CONSOLE_KIT_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ -DPREFIX=\""$(prefix)"\" \ @@ -42,6 +43,41 @@ ck_list_sessions_LDADD = \ $(CONSOLE_KIT_LIBS) \ $(NULL) + +libexec_PROGRAMS = \ + ck-collect-session-info \ + ck-get-x11-server-pid \ + ck-get-x11-display-device \ + $(NULL) + +ck_collect_session_info_SOURCES = \ + ck-collect-session-info.c \ + $(NULL) + +ck_collect_session_info_LDADD = \ + $(TOOLS_LIBS) \ + $(top_builddir)/src/libckproc.la\ + $(NULL) + +ck_get_x11_server_pid_SOURCES = \ + ck-get-x11-server-pid.c \ + $(NULL) + +ck_get_x11_server_pid_LDADD = \ + $(TOOLS_LIBS) \ + $(top_builddir)/src/libckproc.la\ + $(NULL) + +ck_get_x11_display_device_SOURCES = \ + ck-get-x11-display-device.c \ + $(NULL) + +ck_get_x11_display_device_LDADD = \ + $(TOOLS_LIBS) \ + $(top_builddir)/src/libckproc.la\ + $(NULL) + + EXTRA_DIST = \ $(NULL) diff --git a/tools/linux/ck-collect-session-info.c b/tools/ck-collect-session-info.c index 5e8e07d..5e8e07d 100644 --- a/tools/linux/ck-collect-session-info.c +++ b/tools/ck-collect-session-info.c diff --git a/tools/linux/ck-get-x11-display-device.c b/tools/ck-get-x11-display-device.c index 2d414c6..2d414c6 100644 --- a/tools/linux/ck-get-x11-display-device.c +++ b/tools/ck-get-x11-display-device.c diff --git a/tools/linux/ck-get-x11-server-pid.c b/tools/ck-get-x11-server-pid.c index cd48cd1..cd48cd1 100644 --- a/tools/linux/ck-get-x11-server-pid.c +++ b/tools/ck-get-x11-server-pid.c diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am index 1965dc4..0830734 100644 --- a/tools/linux/Makefile.am +++ b/tools/linux/Makefile.am @@ -23,38 +23,6 @@ INCLUDES = \ $(TOOLS_CFLAGS) \ $(NULL) -libexec_PROGRAMS = \ - ck-collect-session-info \ - ck-get-x11-server-pid \ - ck-get-x11-display-device \ - $(NULL) - -ck_collect_session_info_SOURCES = \ - ck-collect-session-info.c \ - $(NULL) - -ck_collect_session_info_LDADD = \ - $(TOOLS_LIBS) \ - $(top_builddir)/src/libckproc.la\ - $(NULL) - -ck_get_x11_server_pid_SOURCES = \ - ck-get-x11-server-pid.c \ - $(NULL) - -ck_get_x11_server_pid_LDADD = \ - $(TOOLS_LIBS) \ - $(top_builddir)/src/libckproc.la\ - $(NULL) - -ck_get_x11_display_device_SOURCES = \ - ck-get-x11-display-device.c \ - $(NULL) - -ck_get_x11_display_device_LDADD = \ - $(TOOLS_LIBS) \ - $(top_builddir)/src/libckproc.la\ - $(NULL) EXTRA_DIST = \ $(NULL) |