mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Revert "build: Stop creating the symlinks in include/ on the fly."
This reverts commit cdcea0bf55.
This commit is contained in:
Joe Thornber
parent
3ea862bdfc
commit
1553993ea1
3
configure
vendored
3
configure
vendored
@ -15583,7 +15583,7 @@ _ACEOF
|
||||
|
||||
|
||||
################################################################################
|
||||
ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile"
|
||||
ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@ -16305,6 +16305,7 @@ do
|
||||
"conf/lvmlocal.conf") CONFIG_FILES="$CONFIG_FILES conf/lvmlocal.conf" ;;
|
||||
"conf/command_profile_template.profile") CONFIG_FILES="$CONFIG_FILES conf/command_profile_template.profile" ;;
|
||||
"conf/metadata_profile_template.profile") CONFIG_FILES="$CONFIG_FILES conf/metadata_profile_template.profile" ;;
|
||||
"include/.symlinks") CONFIG_FILES="$CONFIG_FILES include/.symlinks" ;;
|
||||
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
|
||||
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
|
||||
"lib/locking/Makefile") CONFIG_FILES="$CONFIG_FILES lib/locking/Makefile" ;;
|
||||
|
||||
@ -2128,6 +2128,7 @@ conf/example.conf
|
||||
conf/lvmlocal.conf
|
||||
conf/command_profile_template.profile
|
||||
conf/metadata_profile_template.profile
|
||||
include/.symlinks
|
||||
include/Makefile
|
||||
lib/Makefile
|
||||
lib/locking/Makefile
|
||||
|
||||
6
include/.gitignore
vendored
6
include/.gitignore
vendored
@ -1,2 +1,4 @@
|
||||
configure.h
|
||||
lvm-version.h
|
||||
.symlinks
|
||||
.symlinks_created
|
||||
|
||||
*.h
|
||||
|
||||
80
include/.symlinks.in
Normal file
80
include/.symlinks.in
Normal file
@ -0,0 +1,80 @@
|
||||
@top_srcdir@/daemons/clvmd/clvm.h
|
||||
@top_srcdir@/daemons/dmeventd/libdevmapper-event.h
|
||||
@top_srcdir@/daemons/lvmetad/lvmetad-client.h
|
||||
@top_srcdir@/daemons/lvmlockd/lvmlockd-client.h
|
||||
@top_srcdir@/daemons/lvmpolld/lvmpolld-protocol.h
|
||||
@top_srcdir@/daemons/lvmpolld/polling_ops.h
|
||||
@top_srcdir@/lib/activate/activate.h
|
||||
@top_srcdir@/lib/activate/targets.h
|
||||
@top_srcdir@/lib/cache/lvmcache.h
|
||||
@top_srcdir@/lib/cache/lvmetad.h
|
||||
@top_srcdir@/lib/commands/toolcontext.h
|
||||
@top_srcdir@/lib/config/config.h
|
||||
@top_srcdir@/lib/config/config_settings.h
|
||||
@top_srcdir@/lib/config/defaults.h
|
||||
@top_srcdir@/lib/datastruct/btree.h
|
||||
@top_srcdir@/lib/datastruct/str_list.h
|
||||
@top_srcdir@/lib/device/bcache.h
|
||||
@top_srcdir@/lib/device/dev-cache.h
|
||||
@top_srcdir@/lib/device/dev-ext-udev-constants.h
|
||||
@top_srcdir@/lib/device/dev-type.h
|
||||
@top_srcdir@/lib/device/device-types.h
|
||||
@top_srcdir@/lib/device/device.h
|
||||
@top_srcdir@/lib/display/display.h
|
||||
@top_srcdir@/lib/filters/filter.h
|
||||
@top_srcdir@/lib/format1/format1.h
|
||||
@top_srcdir@/lib/format_pool/format_pool.h
|
||||
@top_srcdir@/lib/format_text/archiver.h
|
||||
@top_srcdir@/lib/format_text/format-text.h
|
||||
@top_srcdir@/lib/format_text/text_export.h
|
||||
@top_srcdir@/lib/format_text/text_import.h
|
||||
@top_srcdir@/lib/label/label.h
|
||||
@top_srcdir@/lib/locking/locking.h
|
||||
@top_srcdir@/lib/locking/lvmlockd.h
|
||||
@top_srcdir@/lib/log/log.h
|
||||
@top_srcdir@/lib/log/lvm-logging.h
|
||||
@top_srcdir@/lib/lvmpolld/lvmpolld-client.h
|
||||
@top_srcdir@/lib/lvmpolld/polldaemon.h
|
||||
@top_srcdir@/lib/metadata/lv.h
|
||||
@top_srcdir@/lib/metadata/lv_alloc.h
|
||||
@top_srcdir@/lib/metadata/metadata-exported.h
|
||||
@top_srcdir@/lib/metadata/metadata.h
|
||||
@top_srcdir@/lib/metadata/pv.h
|
||||
@top_srcdir@/lib/metadata/pv_alloc.h
|
||||
@top_srcdir@/lib/metadata/segtype.h
|
||||
@top_srcdir@/lib/metadata/vg.h
|
||||
@top_srcdir@/lib/misc/crc.h
|
||||
@top_srcdir@/lib/misc/intl.h
|
||||
@top_srcdir@/lib/misc/last-path-component.h
|
||||
@top_srcdir@/lib/misc/lib.h
|
||||
@top_srcdir@/lib/misc/lvm-exec.h
|
||||
@top_srcdir@/lib/misc/lvm-file.h
|
||||
@top_srcdir@/lib/misc/lvm-flock.h
|
||||
@top_srcdir@/lib/misc/lvm-globals.h
|
||||
@top_srcdir@/lib/misc/lvm-maths.h
|
||||
@top_srcdir@/lib/misc/lvm-percent.h
|
||||
@top_srcdir@/lib/misc/lvm-signal.h
|
||||
@top_srcdir@/lib/misc/lvm-string.h
|
||||
@top_srcdir@/lib/misc/lvm-wrappers.h
|
||||
@top_srcdir@/lib/misc/sharedlib.h
|
||||
@top_srcdir@/lib/misc/util.h
|
||||
@top_srcdir@/lib/mm/memlock.h
|
||||
@top_srcdir@/lib/mm/xlate.h
|
||||
@top_srcdir@/lib/notify/lvmnotify.h
|
||||
@top_srcdir@/lib/properties/prop_common.h
|
||||
@top_srcdir@/lib/report/properties.h
|
||||
@top_srcdir@/lib/report/report.h
|
||||
@top_srcdir@/lib/uuid/uuid.h
|
||||
@top_srcdir@/libdaemon/client/config-util.h
|
||||
@top_srcdir@/libdaemon/client/daemon-client.h
|
||||
@top_srcdir@/libdaemon/client/daemon-io.h
|
||||
@top_srcdir@/libdm/libdevmapper.h
|
||||
@top_srcdir@/libdm/misc/dm-ioctl.h
|
||||
@top_srcdir@/libdm/misc/dm-log-userspace.h
|
||||
@top_srcdir@/libdm/misc/dm-logging.h
|
||||
@top_srcdir@/libdm/misc/dmlib.h
|
||||
@top_srcdir@/libdm/misc/kdev_t.h
|
||||
@top_srcdir@/liblvm/lvm2app.h
|
||||
@top_srcdir@/po/pogen.h
|
||||
@top_srcdir@/tools/lvm2cmd.h
|
||||
@top_srcdir@/tools/tool.h
|
||||
@ -18,4 +18,22 @@ top_builddir = @top_builddir@
|
||||
|
||||
include $(top_builddir)/make.tmpl
|
||||
|
||||
DISTCLEAN_TARGETS += configure.h lvm-version.h
|
||||
all: .symlinks_created
|
||||
|
||||
LINKS := $(shell find . -maxdepth 1 -type l)
|
||||
|
||||
.symlinks_created: .symlinks
|
||||
ifneq (,$(firstword $(LINKS)))
|
||||
$(RM) $(LINKS)
|
||||
endif
|
||||
for i in `cat $<`; do $(LN_S) $$i ; done
|
||||
touch $@
|
||||
|
||||
pofile: all
|
||||
|
||||
device-mapper: all
|
||||
|
||||
cflow: all
|
||||
|
||||
DISTCLEAN_TARGETS += .symlinks configure.h lvm-version.h
|
||||
CLEAN_TARGETS += $(LINKS) .include_symlinks .symlinks_created
|
||||
|
||||
@ -1 +0,0 @@
|
||||
../lib/activate/activate.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/format_text/archiver.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/device/bcache.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/datastruct/btree.h
|
||||
@ -1 +0,0 @@
|
||||
../daemons/clvmd/clvm.h
|
||||
@ -1 +0,0 @@
|
||||
../libdaemon/client/config-util.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/config/config.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/config/config_settings.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/crc.h
|
||||
@ -1 +0,0 @@
|
||||
../libdaemon/client/daemon-client.h
|
||||
@ -1 +0,0 @@
|
||||
../libdaemon/client/daemon-io.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/config/defaults.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/device/dev-cache.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/device/dev-ext-udev-constants.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/device/dev-type.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/device/device-types.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/device/device.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/display/display.h
|
||||
@ -1 +0,0 @@
|
||||
../libdm/misc/dm-ioctl.h
|
||||
@ -1 +0,0 @@
|
||||
../libdm/misc/dm-log-userspace.h
|
||||
@ -1 +0,0 @@
|
||||
../libdm/misc/dm-logging.h
|
||||
@ -1 +0,0 @@
|
||||
../libdm/misc/dmlib.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/filters/filter.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/format_text/format-text.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/format1/format1.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/format_pool/format_pool.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/intl.h
|
||||
@ -1 +0,0 @@
|
||||
../libdm/misc/kdev_t.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/label/label.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/last-path-component.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/lib.h
|
||||
@ -1 +0,0 @@
|
||||
../daemons/dmeventd/libdevmapper-event.h
|
||||
@ -1 +0,0 @@
|
||||
../libdm/libdevmapper.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/locking/locking.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/log/log.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/metadata/lv.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/metadata/lv_alloc.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/lvm-exec.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/lvm-file.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/lvm-flock.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/lvm-globals.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/log/lvm-logging.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/lvm-maths.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/lvm-percent.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/lvm-signal.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/lvm-string.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/lvm-wrappers.h
|
||||
@ -1 +0,0 @@
|
||||
../liblvm/lvm2app.h
|
||||
@ -1 +0,0 @@
|
||||
../tools/lvm2cmd.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/cache/lvmcache.h
|
||||
@ -1 +0,0 @@
|
||||
../daemons/lvmetad/lvmetad-client.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/cache/lvmetad.h
|
||||
@ -1 +0,0 @@
|
||||
../daemons/lvmlockd/lvmlockd-client.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/locking/lvmlockd.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/notify/lvmnotify.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/lvmpolld/lvmpolld-client.h
|
||||
@ -1 +0,0 @@
|
||||
../daemons/lvmpolld/lvmpolld-protocol.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/mm/memlock.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/metadata/metadata-exported.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/metadata/metadata.h
|
||||
@ -1 +0,0 @@
|
||||
../po/pogen.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/lvmpolld/polldaemon.h
|
||||
@ -1 +0,0 @@
|
||||
../daemons/lvmpolld/polling_ops.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/properties/prop_common.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/report/properties.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/metadata/pv.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/metadata/pv_alloc.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/report/report.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/metadata/segtype.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/sharedlib.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/datastruct/str_list.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/activate/targets.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/format_text/text_export.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/format_text/text_import.h
|
||||
@ -1 +0,0 @@
|
||||
../tools/tool.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/commands/toolcontext.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/misc/util.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/uuid/uuid.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/metadata/vg.h
|
||||
@ -1 +0,0 @@
|
||||
../lib/mm/xlate.h
|
||||
10
make.tmpl.in
10
make.tmpl.in
@ -306,10 +306,12 @@ LIB_VERSION_DM := $(shell $(AWK) -F '.' '{printf "%s.%s",$$1,$$2}' $(top_srcdir)
|
||||
|
||||
LIB_VERSION_APP := $(shell $(AWK) -F '[(). ]' '{printf "%s.%s",$$1,$$4}' $(top_srcdir)/VERSION)
|
||||
|
||||
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include
|
||||
INCLUDES += -I$(srcdir) -I$(top_builddir)/include
|
||||
|
||||
INC_LNS = $(top_builddir)/include/.symlinks_created
|
||||
|
||||
DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \
|
||||
$(top_builddir)/Makefile
|
||||
$(top_builddir)/Makefile $(INC_LNS)
|
||||
|
||||
OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o)
|
||||
POTFILES = $(SOURCES:%.c=%.pot)
|
||||
@ -504,9 +506,9 @@ $(LIB_STATIC): $(OBJECTS)
|
||||
$(Q) $(RM) $@
|
||||
$(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null
|
||||
|
||||
%.d: ;
|
||||
%.d: $(INC_LNS)
|
||||
.PRECIOUS: %.d
|
||||
|
||||
|
||||
%.mo: %.po
|
||||
@echo " [MSGFMT] $<"
|
||||
$(Q) $(MSGFMT) -o $@ $<
|
||||
|
||||
Loading…
Reference in New Issue
Block a user