diff options
| author | Alasdair Kergon <agk@redhat.com> | 2004-11-26 18:07:17 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2004-11-26 18:07:17 +0000 |
| commit | a266258f4c8884b6c56d6f0b5f7c891982741a6d (patch) | |
| tree | 8cb9103985f008dd95e149e001a338337b236f69 /daemons | |
| parent | 57b8df3e45919524aec2e91a19b6347024e15c90 (diff) | |
| download | lvm2-a266258f4c8884b6c56d6f0b5f7c891982741a6d.tar.gz | |
Configure/makefile tidy.
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/clvmd/Makefile.in | 30 | ||||
| -rw-r--r-- | daemons/clvmd/clvmd.c | 2 |
2 files changed, 13 insertions, 19 deletions
diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in index a5ab680ba..0fbd18f1e 100644 --- a/daemons/clvmd/Makefile.in +++ b/daemons/clvmd/Makefile.in @@ -15,27 +15,22 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -ifeq ("@CLVMD@", "gulm") -SOURCES = \ - clvmd-gulm.c \ - tcp-comms.c \ - clvmd-command.c \ - clvmd.c \ - libclvm.c \ - lvm-functions.c \ - system-lv.c -LM_LIBS = -lccs -lgulm -LM_FLAGS= -DUSE_GULM -else SOURCES = \ - clvmd-cman.c \ clvmd-command.c \ clvmd.c \ libclvm.c \ lvm-functions.c \ system-lv.c -LM_LIBS = -ldlm -LM_FLAGS= + +ifeq ("@CLVMD@", "gulm") + SOURCES += clvmd-gulm.c tcp-comms.c + LMLIBS += -lccs -lgulm + CFLAGS += -DUSE_GULM +endif + +ifeq ("@CLVMD@", "cman") + SOURCES += clvmd-cman.c + LMLIBS += -ldlm endif TARGETS = \ @@ -43,15 +38,14 @@ TARGETS = \ include $(top_srcdir)/make.tmpl -CFLAGS += -D_REENTRANT -fno-strict-aliasing $(LM_FLAGS) +CFLAGS += -D_REENTRANT -fno-strict-aliasing LIBS += -ldevmapper -llvm -lpthread - INSTALL_TARGETS = \ install_clvmd clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a - $(CC) -o clvmd $(OBJECTS) $(LDFLAGS) $(LVMLIBS) $(LM_LIBS) $(LIBS) + $(CC) -o clvmd $(OBJECTS) $(LDFLAGS) $(LVMLIBS) $(LMLIBS) $(LIBS) .PHONY: install_clvmd diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c index a04fcd5ce..e69d15043 100644 --- a/daemons/clvmd/clvmd.c +++ b/daemons/clvmd/clvmd.c @@ -39,7 +39,7 @@ #include "clvmd-comms.h" #include "lvm-functions.h" #include "clvm.h" -#include "../../tools/version.h" +#include "version.h" #include "clvmd.h" #include "libdlm.h" #include "system-lv.h" |