diff options
-rw-r--r-- | src/Makefile.am | 39 | ||||
-rw-r--r-- | tools/linux/Makefile.am | 7 |
2 files changed, 28 insertions, 18 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 136d88a..c63abf3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,6 +23,30 @@ INCLUDES = \ $(DBUS_CFLAGS) \ $(NULL) +noinst_LTLIBRARIES = \ + libckproc.la \ + $(NULL) + +libckproc_la_SOURCES = \ + proc.h \ + $(NULL) + +if CK_COMPILE_LINUX +libckproc_la_SOURCES += \ + proc-linux.c \ + $(NULL) +endif +if CK_COMPILE_SOLARIS +libckproc_la_SOURCES += \ + proc-solaris.c \ + $(NULL) +endif + +EXTRA_libckproc_la_SOURCES = \ + proc-linux.c \ + proc-solaris.c \ + $(NULL) + sbin_PROGRAMS = \ console-kit-daemon \ $(NULL) @@ -49,17 +73,6 @@ ck-marshal.c: ck-marshal.list ck-marshal.h: ck-marshal.list @GLIB_GENMARSHAL@ $< --prefix=ck_marshal --header > $@ -if CK_COMPILE_LINUX -PLATFORM_SOURCES = \ - proc-linux.c \ - $(NULL) -endif -if CK_COMPILE_SOLARIS -PLATFORM_SOURCES = \ - proc-solaris.c \ - $(NULL) -endif - console_kit_daemon_SOURCES = \ main.c \ ck-manager.h \ @@ -79,7 +92,6 @@ console_kit_daemon_SOURCES = \ ck-log.c \ getfd.c \ proc.h \ - $(PLATFORM_SOURCES) \ $(BUILT_SOURCES) \ $(NULL) @@ -94,12 +106,11 @@ console_kit_daemon_SOURCES += $(FILE_MONITOR_BACKEND) EXTRA_console_kit_daemon_SOURCES = \ ck-file-monitor-inotify.c \ ck-file-monitor-dummy.c \ - proc-linux.c \ - proc-solaris.c \ $(NULL) console_kit_daemon_LDADD = \ $(CONSOLE_KIT_LIBS) \ + libckproc.la \ $(NULL) noinst_PROGRAMS = \ diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am index 4b570a7..1965dc4 100644 --- a/tools/linux/Makefile.am +++ b/tools/linux/Makefile.am @@ -30,13 +30,12 @@ libexec_PROGRAMS = \ $(NULL) ck_collect_session_info_SOURCES = \ - $(top_srcdir)/src/proc.h \ - $(top_srcdir)/src/proc-linux.c \ 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 = \ @@ -45,16 +44,16 @@ ck_get_x11_server_pid_SOURCES = \ ck_get_x11_server_pid_LDADD = \ $(TOOLS_LIBS) \ + $(top_builddir)/src/libckproc.la\ $(NULL) ck_get_x11_display_device_SOURCES = \ - $(top_srcdir)/src/proc.h \ - $(top_srcdir)/src/proc-linux.c \ ck-get-x11-display-device.c \ $(NULL) ck_get_x11_display_device_LDADD = \ $(TOOLS_LIBS) \ + $(top_builddir)/src/libckproc.la\ $(NULL) EXTRA_DIST = \ |