diff options
| author | Alasdair Kergon <agk@redhat.com> | 2008-11-03 22:14:30 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2008-11-03 22:14:30 +0000 |
| commit | 2c44337bd5ff7aa217a39003460cba4742a1b867 (patch) | |
| tree | 96e88ac95f4a573f099338ec48df36c9c55ff926 /make.tmpl.in | |
| parent | 28f60ff82f7c13236475129295a88a01d61838c7 (diff) | |
| download | lvm2-2c44337bd5ff7aa217a39003460cba4742a1b867.tar.gz lvm2-2c44337bd5ff7aa217a39003460cba4742a1b867.tar.xz lvm2-2c44337bd5ff7aa217a39003460cba4742a1b867.zip | |
Right, a simple build (without options) is working again.
Diffstat (limited to 'make.tmpl.in')
| -rw-r--r-- | make.tmpl.in | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/make.tmpl.in b/make.tmpl.in index fe75bba3..4428d679 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -51,6 +51,9 @@ mandir = $(DESTDIR)@mandir@ localedir = $(DESTDIR)@LOCALEDIR@ staticdir = $(DESTDIR)@STATICDIR@ +interface = @interface@ +interfacedir = $(top_srcdir)/libdm/$(interface) + # setup misc variables # define the ownership variables for the binaries and man pages OWNER = @OWNER@ @@ -80,7 +83,8 @@ ifeq ("@INTL@", "yes") DEFS += -DINTL_PACKAGE=\"@INTL_PACKAGE@\" -DLOCALEDIR=\"@LOCALEDIR@\" endif -LDFLAGS += -L$(top_srcdir)/lib -L$(libdir) +LDFLAGS += -L$(top_srcdir)/libdm -L$(top_srcdir)/lib +CLDFLAGS += -L$(top_srcdir)/libdm -L$(top_srcdir)/lib #DEFS += -DDEBUG_POOL #DEFS += -DBOUNDS_CHECK @@ -93,8 +97,11 @@ STRIP= LVM_VERSION := $(shell cat $(top_srcdir)/VERSION) -LIB_VERSION := $(shell cat $(top_srcdir)/VERSION | \ - awk -F '.' '{printf "%s.%s",$$1,$$2}') +LIB_VERSION_LVM := $(shell cat $(top_srcdir)/VERSION | \ + awk -F '.' '{printf "%s.%s",$$1,$$2}') + +LIB_VERSION_DM := $(shell cat $(top_srcdir)/VERSION_DM | \ + awk -F '.' '{printf "%s.%s",$$1,$$2}') INCLUDES += -I$(top_srcdir)/include @@ -123,12 +130,10 @@ SUBDIRS.cflow := $(SUBDIRS:=.cflow) SUBDIRS.clean := $(SUBDIRS:=.clean) SUBDIRS.distclean := $(SUBDIRS:=.distclean) -TARGETS += $(LIB_SHARED) $(LIB_STATIC) +TARGETS += $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB) all: $(SUBDIRS) $(TARGETS) -device-mapper: $(SUBDIRS.device-mapper) - install: all $(SUBDIRS.install) install_cluster: all $(SUBDIRS.install_cluster) install_device-mapper: $(SUBDIRS.install_device-mapper) |