diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2018-12-15 01:55:11 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2018-12-17 10:55:20 +0100 |
| commit | 94237354ddbf2abc0f04e7f06ee3c1263dfc6b6e (patch) | |
| tree | 4a8991e7e52deedde5c156c28dcd458b98c30aa6 /make.tmpl.in | |
| parent | 0dc7abe013729b3b3560b67fcc37f3cc619f323d (diff) | |
| download | lvm2-94237354ddbf2abc0f04e7f06ee3c1263dfc6b6e.tar.gz | |
makefiles: correcting login of makefile
Fixing some ordering issue with inclusion of common make.tmpl.
Correcting dependency calculation
Simplifying inclusive makefile
Diffstat (limited to 'make.tmpl.in')
| -rw-r--r-- | make.tmpl.in | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/make.tmpl.in b/make.tmpl.in index d7b65689f..9158f0e12 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -72,9 +72,6 @@ CLDFLAGS += @CLDFLAGS@ ELDFLAGS += @ELDFLAGS@ LDDEPS += @LDDEPS@ LIB_SUFFIX = @LIB_SUFFIX@ -LVMINTERNAL_LIBS=\ - -llvm-internal \ - $(DAEMON_LIBS) $(DMEVENT_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) DL_LIBS = @DL_LIBS@ RT_LIBS = @RT_LIBS@ M_LIBS = @M_LIBS@ @@ -266,13 +263,6 @@ endif # end of fPIC protection endif -LDFLAGS += -L$(top_builddir)/lib -CLDFLAGS += -L$(top_builddir)/lib - -DAEMON_LIBS = -ldaemonclient -LDFLAGS += -L$(top_builddir)/libdaemon/client -CLDFLAGS += -L$(top_builddir)/libdaemon/client - ifeq ("@BUILD_DMEVENTD@", "yes") DMEVENT_LIBS = -ldevmapper-event LDFLAGS += -L$(top_builddir)/daemons/dmeventd @@ -338,11 +328,13 @@ SUBDIRS.distclean := $(SUBDIRS:=.distclean) TARGETS += $(LIB_SHARED) $(LIB_STATIC) -INTERNAL_LIBS=\ +INTERNAL_LIBS = \ + $(top_builddir)/libdaemon/client/libdaemonclient.a \ $(top_builddir)/device_mapper/libdevice-mapper.a \ $(top_builddir)/base/libbase.a - -all: $(INTERNAL_LIBS) $(SUBDIRS) $(TARGETS) +LVMINTERNAL_LIBS = $(top_builddir)/lib/liblvm-internal.a $(INTERNAL_LIBS) + +all: $(SUBDIRS) $(TARGETS) install: all $(SUBDIRS.install) install_cluster: all $(SUBDIRS.install_cluster) @@ -351,7 +343,7 @@ install_lvm2: $(SUBDIRS.install_lvm2) install_ocf: $(SUBDIRS.install_ocf) cflow: $(SUBDIRS.cflow) -$(SUBDIRS): $(SUBDIRS.device-mapper) $(INTERNAL_LIBS) +$(SUBDIRS): $(SUBDIRS.device-mapper) $(MAKE) -C $@ $(SUBDIRS.device-mapper): @@ -577,13 +569,15 @@ else endif ifeq ("$(USE_TRACKING)","yes") -ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \ - help check check_local check_cluster check_lvmpolld)) +ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov lcov-reset \ + help check check_local check_cluster check_lvmpolld run-unit-test tags)) +# Note: no tabs before -include ifdef SOURCES -include $(SOURCES:.c=.d) $(CXXSOURCES:.cpp=.d) endif ifdef SOURCES2 -include $(SOURCES2:.c=.d) endif + DEPENDS = yes endif endif |