1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00

Revert "build: Stop creating the symlinks in include/ on the fly."

This reverts commit cdcea0bf55.
This commit is contained in:
Joe Thornber 2018-05-01 20:03:51 +01:00
parent 3ea862bdfc
commit 1553993ea1
86 changed files with 112 additions and 88 deletions

3
configure vendored
View File

@ -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 cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # 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/lvmlocal.conf") CONFIG_FILES="$CONFIG_FILES conf/lvmlocal.conf" ;;
"conf/command_profile_template.profile") CONFIG_FILES="$CONFIG_FILES conf/command_profile_template.profile" ;; "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" ;; "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" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"lib/locking/Makefile") CONFIG_FILES="$CONFIG_FILES lib/locking/Makefile" ;; "lib/locking/Makefile") CONFIG_FILES="$CONFIG_FILES lib/locking/Makefile" ;;

View File

@ -2128,6 +2128,7 @@ conf/example.conf
conf/lvmlocal.conf conf/lvmlocal.conf
conf/command_profile_template.profile conf/command_profile_template.profile
conf/metadata_profile_template.profile conf/metadata_profile_template.profile
include/.symlinks
include/Makefile include/Makefile
lib/Makefile lib/Makefile
lib/locking/Makefile lib/locking/Makefile

6
include/.gitignore vendored
View File

@ -1,2 +1,4 @@
configure.h .symlinks
lvm-version.h .symlinks_created
*.h

80
include/.symlinks.in Normal file
View 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

View File

@ -18,4 +18,22 @@ top_builddir = @top_builddir@
include $(top_builddir)/make.tmpl 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

View File

@ -1 +0,0 @@
../lib/activate/activate.h

View File

@ -1 +0,0 @@
../lib/format_text/archiver.h

View File

@ -1 +0,0 @@
../lib/device/bcache.h

View File

@ -1 +0,0 @@
../lib/datastruct/btree.h

View File

@ -1 +0,0 @@
../daemons/clvmd/clvm.h

View File

@ -1 +0,0 @@
../libdaemon/client/config-util.h

View File

@ -1 +0,0 @@
../lib/config/config.h

View File

@ -1 +0,0 @@
../lib/config/config_settings.h

View File

@ -1 +0,0 @@
../lib/misc/crc.h

View File

@ -1 +0,0 @@
../libdaemon/client/daemon-client.h

View File

@ -1 +0,0 @@
../libdaemon/client/daemon-io.h

View File

@ -1 +0,0 @@
../lib/config/defaults.h

View File

@ -1 +0,0 @@
../lib/device/dev-cache.h

View File

@ -1 +0,0 @@
../lib/device/dev-ext-udev-constants.h

View File

@ -1 +0,0 @@
../lib/device/dev-type.h

View File

@ -1 +0,0 @@
../lib/device/device-types.h

View File

@ -1 +0,0 @@
../lib/device/device.h

View File

@ -1 +0,0 @@
../lib/display/display.h

View File

@ -1 +0,0 @@
../libdm/misc/dm-ioctl.h

View File

@ -1 +0,0 @@
../libdm/misc/dm-log-userspace.h

View File

@ -1 +0,0 @@
../libdm/misc/dm-logging.h

View File

@ -1 +0,0 @@
../libdm/misc/dmlib.h

View File

@ -1 +0,0 @@
../lib/filters/filter.h

View File

@ -1 +0,0 @@
../lib/format_text/format-text.h

View File

@ -1 +0,0 @@
../lib/format1/format1.h

View File

@ -1 +0,0 @@
../lib/format_pool/format_pool.h

View File

@ -1 +0,0 @@
../lib/misc/intl.h

View File

@ -1 +0,0 @@
../libdm/misc/kdev_t.h

View File

@ -1 +0,0 @@
../lib/label/label.h

View File

@ -1 +0,0 @@
../lib/misc/last-path-component.h

View File

@ -1 +0,0 @@
../lib/misc/lib.h

View File

@ -1 +0,0 @@
../daemons/dmeventd/libdevmapper-event.h

View File

@ -1 +0,0 @@
../libdm/libdevmapper.h

View File

@ -1 +0,0 @@
../lib/locking/locking.h

View File

@ -1 +0,0 @@
../lib/log/log.h

View File

@ -1 +0,0 @@
../lib/metadata/lv.h

View File

@ -1 +0,0 @@
../lib/metadata/lv_alloc.h

View File

@ -1 +0,0 @@
../lib/misc/lvm-exec.h

View File

@ -1 +0,0 @@
../lib/misc/lvm-file.h

View File

@ -1 +0,0 @@
../lib/misc/lvm-flock.h

View File

@ -1 +0,0 @@
../lib/misc/lvm-globals.h

View File

@ -1 +0,0 @@
../lib/log/lvm-logging.h

View File

@ -1 +0,0 @@
../lib/misc/lvm-maths.h

View File

@ -1 +0,0 @@
../lib/misc/lvm-percent.h

View File

@ -1 +0,0 @@
../lib/misc/lvm-signal.h

View File

@ -1 +0,0 @@
../lib/misc/lvm-string.h

View File

@ -1 +0,0 @@
../lib/misc/lvm-wrappers.h

View File

@ -1 +0,0 @@
../liblvm/lvm2app.h

View File

@ -1 +0,0 @@
../tools/lvm2cmd.h

View File

@ -1 +0,0 @@
../lib/cache/lvmcache.h

View File

@ -1 +0,0 @@
../daemons/lvmetad/lvmetad-client.h

View File

@ -1 +0,0 @@
../lib/cache/lvmetad.h

View File

@ -1 +0,0 @@
../daemons/lvmlockd/lvmlockd-client.h

View File

@ -1 +0,0 @@
../lib/locking/lvmlockd.h

View File

@ -1 +0,0 @@
../lib/notify/lvmnotify.h

View File

@ -1 +0,0 @@
../lib/lvmpolld/lvmpolld-client.h

View File

@ -1 +0,0 @@
../daemons/lvmpolld/lvmpolld-protocol.h

View File

@ -1 +0,0 @@
../lib/mm/memlock.h

View File

@ -1 +0,0 @@
../lib/metadata/metadata-exported.h

View File

@ -1 +0,0 @@
../lib/metadata/metadata.h

View File

@ -1 +0,0 @@
../po/pogen.h

View File

@ -1 +0,0 @@
../lib/lvmpolld/polldaemon.h

View File

@ -1 +0,0 @@
../daemons/lvmpolld/polling_ops.h

View File

@ -1 +0,0 @@
../lib/properties/prop_common.h

View File

@ -1 +0,0 @@
../lib/report/properties.h

View File

@ -1 +0,0 @@
../lib/metadata/pv.h

View File

@ -1 +0,0 @@
../lib/metadata/pv_alloc.h

View File

@ -1 +0,0 @@
../lib/report/report.h

View File

@ -1 +0,0 @@
../lib/metadata/segtype.h

View File

@ -1 +0,0 @@
../lib/misc/sharedlib.h

View File

@ -1 +0,0 @@
../lib/datastruct/str_list.h

View File

@ -1 +0,0 @@
../lib/activate/targets.h

View File

@ -1 +0,0 @@
../lib/format_text/text_export.h

View File

@ -1 +0,0 @@
../lib/format_text/text_import.h

View File

@ -1 +0,0 @@
../tools/tool.h

View File

@ -1 +0,0 @@
../lib/commands/toolcontext.h

View File

@ -1 +0,0 @@
../lib/misc/util.h

View File

@ -1 +0,0 @@
../lib/uuid/uuid.h

View File

@ -1 +0,0 @@
../lib/metadata/vg.h

View File

@ -1 +0,0 @@
../lib/mm/xlate.h

View File

@ -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) 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 \ DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \
$(top_builddir)/Makefile $(top_builddir)/Makefile $(INC_LNS)
OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o) OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o)
POTFILES = $(SOURCES:%.c=%.pot) POTFILES = $(SOURCES:%.c=%.pot)
@ -504,7 +506,7 @@ $(LIB_STATIC): $(OBJECTS)
$(Q) $(RM) $@ $(Q) $(RM) $@
$(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null $(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null
%.d: ; %.d: $(INC_LNS)
.PRECIOUS: %.d .PRECIOUS: %.d
%.mo: %.po %.mo: %.po