build: Don't generate symlinks in include/ dir

As we start refactoring the code to break dependencies (see doc/refactoring.txt),
I want us to use full paths in the includes (eg, #include "base/data-struct/list.h").
This makes it more obvious when we're breaking abstraction boundaries, eg, including a file in
metadata/ from base/

2 files changed, 1 insertions, 99 deletions

diff --git a/include/.symlinks.in b/include/.symlinks.in
deleted file mode 100644
index 3d5075058..000000000
--- a/include/.symlinks.in
+++ /dev/null
@@ -1,80 +0,0 @@
-@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
diff --git a/include/Makefile.in b/include/Makefile.in
index b2571fd62..cbbc00386 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -18,22 +18,4 @@ top_builddir = @top_builddir@
 
 include $(top_builddir)/make.tmpl
 
-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
+DISTCLEAN_TARGETS += .configure.h lvm-version.h