diff options
| author | Petr Rockai <prockai@redhat.com> | 2012-09-10 07:40:00 +0200 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2012-09-26 17:26:23 +0200 |
| commit | 0a87fed794f2886047298bbc7b21919e9fc04951 (patch) | |
| tree | 2a86550a42a487dabe673659710d58e9cf548913 | |
| parent | ca0c8673b2064ceb840ee7f4cb5804b33e55f3c7 (diff) | |
| download | lvm2-0a87fed794f2886047298bbc7b21919e9fc04951.tar.gz lvm2-0a87fed794f2886047298bbc7b21919e9fc04951.tar.xz lvm2-0a87fed794f2886047298bbc7b21919e9fc04951.zip | |
Makefiles: Build libdaemonclient unconditionally.
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | libdaemon/Makefile.in | 4 | ||||
| -rw-r--r-- | make.tmpl.in | 8 |
3 files changed, 7 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index 43161902..6b153d33 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,16 +26,12 @@ ifeq ("@INTL@", "yes") SUBDIRS += po endif -SUBDIRS += lib tools daemons libdm +SUBDIRS += lib tools daemons libdm libdaemon ifeq ("@APPLIB@", "yes") SUBDIRS += liblvm endif -ifeq ("@BUILD_LVMETAD@", "yes") - SUBDIRS += libdaemon -endif - SUBDIRS += scripts # FIXME Should use intermediate Makefiles here! diff --git a/libdaemon/Makefile.in b/libdaemon/Makefile.in index fbe5a087..dbe65168 100644 --- a/libdaemon/Makefile.in +++ b/libdaemon/Makefile.in @@ -17,8 +17,10 @@ top_builddir = @top_builddir@ .PHONY: client server +SUBDIRS += client + ifeq ("@BUILD_LVMETAD@", "yes") - SUBDIRS += client server + SUBDIRS += server server: client endif diff --git a/make.tmpl.in b/make.tmpl.in index b8b127fa..21fd4150 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -144,11 +144,9 @@ endif LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib -ifeq ("@BUILD_LVMETAD@", "yes") - DAEMON_LIBS = -ldaemonclient - LDFLAGS += -L$(top_builddir)/libdaemon/client - CLDFLAGS += -L$(top_builddir)/libdaemon/client -endif +DAEMON_LIBS = -ldaemonclient +LDFLAGS += -L$(top_builddir)/libdaemon/client +CLDFLAGS += -L$(top_builddir)/libdaemon/client ifeq ("@DMEVENTD@", "yes") LDFLAGS += -L$(top_builddir)/daemons/dmeventd |