diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-04-12 15:26:39 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-04-12 15:26:39 +0200 |
| commit | d41ba529b4d7a57456c030e5d20546e6f0abfef3 (patch) | |
| tree | a271e2786259a8da89eb336ad4e3f30a7b0a82d3 | |
| parent | move remainig shared stuff to shared/ (diff) | |
| download | systemd-d41ba529b4d7a57456c030e5d20546e6f0abfef3.tar.xz systemd-d41ba529b4d7a57456c030e5d20546e6f0abfef3.zip | |
move libsystemd-id128, libsystemd-daemon to subdir
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | src/.gitignore | 1 | ||||
| -rw-r--r-- | src/libsystemd-daemon/.gitignore | 1 | ||||
| -rw-r--r-- | src/libsystemd-daemon/libsystemd-daemon.pc.in (renamed from src/libsystemd-daemon.pc.in) | 0 | ||||
| -rw-r--r-- | src/libsystemd-daemon/libsystemd-daemon.sym (renamed from src/libsystemd-daemon.sym) | 0 | ||||
| -rw-r--r-- | src/libsystemd-daemon/sd-daemon.c (renamed from src/sd-daemon.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd-id128/.gitignore | 1 | ||||
| -rw-r--r-- | src/libsystemd-id128/libsystemd-id128.pc.in (renamed from src/libsystemd-id128.pc.in) | 0 | ||||
| -rw-r--r-- | src/libsystemd-id128/libsystemd-id128.sym (renamed from src/libsystemd-id128.sym) | 0 | ||||
| -rw-r--r-- | src/libsystemd-id128/sd-id128.c (renamed from src/sd-id128.c) | 0 |
10 files changed, 12 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index aa671791f8..9367dd05db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1160,7 +1160,7 @@ systemd_tty_ask_password_agent_LDADD = \ # ------------------------------------------------------------------------------ libsystemd_daemon_la_SOURCES = \ - src/sd-daemon.c + src/libsystemd-daemon/sd-daemon.c libsystemd_daemon_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1171,7 +1171,7 @@ libsystemd_daemon_la_LDFLAGS = \ $(AM_LDFLAGS) \ -shared \ -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \ - -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym + -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym pkginclude_HEADERS += \ src/systemd/sd-daemon.h @@ -1199,7 +1199,7 @@ lib_LTLIBRARIES += \ libsystemd-daemon.la pkgconfiglib_DATA += \ - src/libsystemd-daemon.pc + src/libsystemd-daemon/libsystemd-daemon.pc MANPAGES += \ man/sd-daemon.7 \ @@ -1222,8 +1222,8 @@ man/sd_is_mq.3: man/sd_is_fifo.3 man/sd_notifyf.3: man/sd_notify.3 EXTRA_DIST += \ - src/libsystemd-daemon.pc.in \ - src/libsystemd-daemon.sym + src/libsystemd-daemon/libsystemd-daemon.pc.in \ + src/libsystemd-daemon/libsystemd-daemon.sym # ------------------------------------------------------------------------------ SUBDIRS += \ @@ -1861,7 +1861,7 @@ udevlibexec_PROGRAMS += \ # ------------------------------------------------------------------------------ libsystemd_id128_la_SOURCES = \ - src/sd-id128.c + src/libsystemd-id128/sd-id128.c libsystemd_id128_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1871,7 +1871,7 @@ libsystemd_id128_la_LDFLAGS = \ $(AM_LDFLAGS) \ -shared \ -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \ - -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym + -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym libsystemd_id128_la_LIBADD = \ libsystemd-shared.la @@ -1893,7 +1893,7 @@ lib_LTLIBRARIES += \ libsystemd-id128.la pkgconfiglib_DATA += \ - src/libsystemd-id128.pc + src/libsystemd-id128/libsystemd-id128.pc # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-id128-install-hook: @@ -1915,8 +1915,8 @@ UNINSTALL_EXEC_HOOKS += \ libsystemd-id128-uninstall-hook EXTRA_DIST += \ - src/libsystemd-id128.pc.in \ - src/libsystemd-id128.sym + src/libsystemd-id128/libsystemd-id128.pc.in \ + src/libsystemd-id128/libsystemd-id128.sym # ------------------------------------------------------------------------------ systemd_journald_SOURCES = \ diff --git a/src/.gitignore b/src/.gitignore index 58d30247b7..afabb6a5d2 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,4 +1,3 @@ -/*.pc load-fragment-gperf-nulstr.c load-fragment-gperf.c load-fragment-gperf.gperf diff --git a/src/libsystemd-daemon/.gitignore b/src/libsystemd-daemon/.gitignore new file mode 100644 index 0000000000..49ca83d0fe --- /dev/null +++ b/src/libsystemd-daemon/.gitignore @@ -0,0 +1 @@ +/*.pc diff --git a/src/libsystemd-daemon.pc.in b/src/libsystemd-daemon/libsystemd-daemon.pc.in index 8bb3a74c87..8bb3a74c87 100644 --- a/src/libsystemd-daemon.pc.in +++ b/src/libsystemd-daemon/libsystemd-daemon.pc.in diff --git a/src/libsystemd-daemon.sym b/src/libsystemd-daemon/libsystemd-daemon.sym index f440238931..f440238931 100644 --- a/src/libsystemd-daemon.sym +++ b/src/libsystemd-daemon/libsystemd-daemon.sym diff --git a/src/sd-daemon.c b/src/libsystemd-daemon/sd-daemon.c index 763e079b4e..763e079b4e 100644 --- a/src/sd-daemon.c +++ b/src/libsystemd-daemon/sd-daemon.c diff --git a/src/libsystemd-id128/.gitignore b/src/libsystemd-id128/.gitignore new file mode 100644 index 0000000000..49ca83d0fe --- /dev/null +++ b/src/libsystemd-id128/.gitignore @@ -0,0 +1 @@ +/*.pc diff --git a/src/libsystemd-id128.pc.in b/src/libsystemd-id128/libsystemd-id128.pc.in index bb65ffde33..bb65ffde33 100644 --- a/src/libsystemd-id128.pc.in +++ b/src/libsystemd-id128/libsystemd-id128.pc.in diff --git a/src/libsystemd-id128.sym b/src/libsystemd-id128/libsystemd-id128.sym index 604c0026c6..604c0026c6 100644 --- a/src/libsystemd-id128.sym +++ b/src/libsystemd-id128/libsystemd-id128.sym diff --git a/src/sd-id128.c b/src/libsystemd-id128/sd-id128.c index 4286ae7d14..4286ae7d14 100644 --- a/src/sd-id128.c +++ b/src/libsystemd-id128/sd-id128.c |