diff options
| author | Ondrej Kozina <okozina@redhat.com> | 2015-04-16 16:29:47 +0200 |
|---|---|---|
| committer | Ondrej Kozina <okozina@redhat.com> | 2015-05-07 15:50:28 +0200 |
| commit | f8c4a46ac22f497ff8f015a0bef04dcaf3ec57f9 (patch) | |
| tree | fd88a9cd086f1c10dab95e7653a4d7c3b2351dd8 | |
| parent | bffa7a1a21c5a11d5a20bbaeb721a87ba3c56240 (diff) | |
| download | lvm2-f8c4a46ac22f497ff8f015a0bef04dcaf3ec57f9.tar.gz | |
fix accidental modification of lvmetad Makefile.in
- revert to current master version
| -rw-r--r-- | daemons/lvmetad/Makefile.in | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/daemons/lvmetad/Makefile.in b/daemons/lvmetad/Makefile.in index 733d7bc84..0a174bb04 100644 --- a/daemons/lvmetad/Makefile.in +++ b/daemons/lvmetad/Makefile.in @@ -16,9 +16,9 @@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ SOURCES = lvmetad-core.c -#SOURCES2 = testclient.c +SOURCES2 = testclient.c -TARGETS = lvmetad +TARGETS = lvmetad lvmetad-testclient .PHONY: install_lvmetad @@ -33,19 +33,15 @@ LVMLIBS = -ldaemonserver $(LVMINTERNAL_LIBS) -ldevmapper LIBS += $(PTHREAD_LIBS) -LDFLAGS += -L$(top_builddir)/libdaemon/server $(DAEMON_LDFLAGS) +LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) CLDFLAGS += -L$(top_builddir)/libdaemon/server -CFLAGS += $(DAEMON_CFLAGS) +CFLAGS += $(EXTRA_EXEC_CFLAGS) lvmetad: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/libdaemon/server/libdaemonserver.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \ $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic -lvmetad-testclient: testclient.o $(top_builddir)/libdaemon/client/libdaemonclient.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ testclient.o \ - $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic - # TODO: No idea. No idea how to test either. #ifneq ("$(CFLOW_CMD)", "") #CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) |