diff options
author | Joe Thornber <ejt@redhat.com> | 2018-05-14 12:16:43 +0100 |
---|---|---|
committer | Joe Thornber <ejt@redhat.com> | 2018-05-16 13:00:50 +0100 |
commit | ccc35e2647b3b78f2fb0d62c25f21fcccbf58950 (patch) | |
tree | b0fc56a0f74b6c6b17c0eeaffa00a921d704b8ec /make.tmpl.in | |
parent | 7f97c7ea9ade36bab817aca9eeee5c5177550127 (diff) | |
download | lvm2-ccc35e2647b3b78f2fb0d62c25f21fcccbf58950.tar.gz |
device-mapper: Fork libdm internally.
The device-mapper directory now holds a copy of libdm source. At
the moment this code is identical to libdm. Over time code will
migrate out to appropriate places (see doc/refactoring.txt).
The libdm directory still exists, and contains the source for the
libdevmapper shared library, which we will continue to ship (though
not neccessarily update).
All code using libdm should now use the version in device-mapper.
Diffstat (limited to 'make.tmpl.in')
-rw-r--r-- | make.tmpl.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/make.tmpl.in b/make.tmpl.in index 7e3f4a481..c4d9d583f 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -68,7 +68,9 @@ CLDFLAGS += @CLDFLAGS@ ELDFLAGS += @ELDFLAGS@ LDDEPS += @LDDEPS@ LIB_SUFFIX = @LIB_SUFFIX@ -LVMINTERNAL_LIBS = -llvm-internal $(DMEVENT_LIBS) $(DAEMON_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS) +LVMINTERNAL_LIBS=\ + -llvm-internal \ + $(DMEVENT_LIBS) $(DAEMON_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS) DL_LIBS = @DL_LIBS@ RT_LIBS = @RT_LIBS@ M_LIBS = @M_LIBS@ @@ -338,7 +340,7 @@ SUBDIRS.distclean := $(SUBDIRS:=.distclean) TARGETS += $(LIB_SHARED) $(LIB_STATIC) -all: $(SUBDIRS) $(TARGETS) +all: $(top_builddir)/device_mapper/libdevice-mapper.a $(SUBDIRS) $(TARGETS) install: all $(SUBDIRS.install) install_cluster: all $(SUBDIRS.install_cluster) @@ -347,7 +349,7 @@ install_lvm2: $(SUBDIRS.install_lvm2) install_ocf: $(SUBDIRS.install_ocf) cflow: $(SUBDIRS.cflow) -$(SUBDIRS): $(SUBDIRS.device-mapper) +$(SUBDIRS): $(SUBDIRS.device-mapper) $(top_builddir)/device_mapper/libdevice-mapper.a $(MAKE) -C $@ $(SUBDIRS.device-mapper): |