util-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/5] some build-sys cosmetics
@ 2018-01-20 18:06 Ruediger Meier
  2018-01-20 18:06 ` [PATCH 1/5] build-sys: remove generated headers from dist tar ball Ruediger Meier
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Ruediger Meier @ 2018-01-20 18:06 UTC (permalink / raw)
  To: util-linux

From: Ruediger Meier <ruediger.meier@ga-group.nl>

All these patches are more less just cosmetics. The first one
"remove generated headers from dist tar ball" is the only
one which should have a visable effect at all.

Ruediger Meier (5):
  build-sys: remove generated headers from dist tar ball
  build-sys: automake is able to find headers in builddir ...
  build-sys: remove unneeded dependencies on bla.h.in
  build-sys: avoid using prog_DEPENDENCIES
  build-sys: remove redundant EXTRA_DIST files

 libblkid/Makemodule.am         |  2 +-
 libblkid/src/Makemodule.am     | 14 ++++----------
 libfdisk/src/Makemodule.am     | 19 +++++--------------
 libmount/src/Makemodule.am     | 18 ++++++------------
 libsmartcols/src/Makemodule.am | 16 +++++-----------
 libuuid/src/Makemodule.am      |  8 ++++----
 6 files changed, 25 insertions(+), 52 deletions(-)

-- 
2.13.6


^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH 1/5] build-sys: remove generated headers from dist tar ball
  2018-01-20 18:06 [PATCH 0/5] some build-sys cosmetics Ruediger Meier
@ 2018-01-20 18:06 ` Ruediger Meier
  2018-01-20 18:06 ` [PATCH 2/5] build-sys: automake is able to find headers in builddir Ruediger Meier
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Ruediger Meier @ 2018-01-20 18:06 UTC (permalink / raw)
  To: util-linux

From: Ruediger Meier <ruediger.meier@ga-group.nl>

Headers should only be listed in either *_HEADERS or
*_SOURCES, especially when we want nodist_*_HEADERS.

Since all the generated headers are made by configure we
don't even need to use BUILT_SOURCES or other tricks.

Also see automake docs 9.4.1 Built Sources Example:
  case "Build bindir.h from configure"

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 libblkid/src/Makemodule.am     | 2 --
 libfdisk/src/Makemodule.am     | 6 +-----
 libmount/src/Makemodule.am     | 6 ++----
 libsmartcols/src/Makemodule.am | 5 +----
 libuuid/src/Makemodule.am      | 4 +---
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index 65d2e66ed..b8843e896 100644
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -26,7 +26,6 @@ libblkid_la_SOURCES = \
 	libblkid/src/tag.c \
 	libblkid/src/verify.c \
 	libblkid/src/version.c \
-	$(nodist_blkidinc_HEADERS) \
 	\
 	libblkid/src/partitions/aix.c \
 	libblkid/src/partitions/aix.h \
@@ -112,7 +111,6 @@ libblkid_la_SOURCES += \
 	libblkid/src/topology/sysfs.c
 endif
 
-nodist_libblkid_la_SOURCES = libblkid/src/blkid.h
 libblkid_la_LIBADD = libcommon.la
 
 libblkid_la_DEPENDENCIES = \
diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index b51de58f4..0e568381f 100644
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -29,11 +29,7 @@ libfdisk_la_SOURCES = \
 	libfdisk/src/sgi.c \
 	libfdisk/src/dos.c \
 	libfdisk/src/bsd.c \
-	libfdisk/src/gpt.c \
-	$(nodist_fdiskinc_HEADERS)
-
-
-nodist_libfdisk_la_SOURCES = libfdisk/src/fdiskP.h
+	libfdisk/src/gpt.c
 
 libfdisk_la_LIBADD = libcommon.la libuuid.la
 
diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index e5861b0ba..516bebbfa 100644
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -8,12 +8,12 @@ libmount_la_SOURCES = \
 	include/list.h \
 	lib/monotonic.c \
 	\
+	libmount/src/mountP.h \
 	libmount/src/cache.c \
 	libmount/src/fs.c \
 	libmount/src/init.c \
 	libmount/src/iter.c \
 	libmount/src/lock.c \
-	libmount/src/mountP.h \
 	libmount/src/optmap.c \
 	libmount/src/optstr.c \
 	libmount/src/tab.c \
@@ -22,8 +22,7 @@ libmount_la_SOURCES = \
 	libmount/src/tab_update.c \
 	libmount/src/test.c \
 	libmount/src/utils.c \
-	libmount/src/version.c \
-	$(nodist_mountinc_HEADERS)
+	libmount/src/version.c
 
 if LINUX
 libmount_la_SOURCES += \
@@ -39,7 +38,6 @@ endif
 
 endif # LINUX
 
-nodist_libmount_la_SOURCES = libmount/src/mountP.h
 
 libmount_la_LIBADD = \
 	libcommon.la \
diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
index 83c12ca54..2b1c1fd1c 100644
--- a/libsmartcols/src/Makemodule.am
+++ b/libsmartcols/src/Makemodule.am
@@ -17,10 +17,7 @@ libsmartcols_la_SOURCES= \
 	libsmartcols/src/table.c \
 	libsmartcols/src/table_print.c \
 	libsmartcols/src/version.c \
-	libsmartcols/src/init.c \
-	$(nodist_smartcolsinc_HEADERS)
-
-nodist_libsmartcols_la_SOURCES = libsmartcols/src/smartcolsP.h
+	libsmartcols/src/init.c
 
 libsmartcols_la_LIBADD = libcommon.la
 
diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
index 0816fac4a..a1c1e4ab3 100644
--- a/libuuid/src/Makemodule.am
+++ b/libuuid/src/Makemodule.am
@@ -11,6 +11,7 @@ uuidinc_HEADERS = libuuid/src/uuid.h
 usrlib_exec_LTLIBRARIES += libuuid.la
 
 libuuid_la_SOURCES = \
+	libuuid/src/uuidP.h \
 	libuuid/src/clear.c \
 	libuuid/src/compare.c \
 	libuuid/src/copy.c \
@@ -21,11 +22,8 @@ libuuid_la_SOURCES = \
 	libuuid/src/unpack.c \
 	libuuid/src/unparse.c \
 	libuuid/src/uuidd.h \
-	libuuid/src/uuidd.h \
-	libuuid/src/uuidP.h \
 	libuuid/src/uuid_time.c \
 	libuuid/src/predefined.c \
-	$(uuidinc_HEADERS) \
 	lib/randutils.c \
 	lib/md5.c \
 	lib/sha1.c
-- 
2.13.6


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 2/5] build-sys: automake is able to find headers in builddir ...
  2018-01-20 18:06 [PATCH 0/5] some build-sys cosmetics Ruediger Meier
  2018-01-20 18:06 ` [PATCH 1/5] build-sys: remove generated headers from dist tar ball Ruediger Meier
@ 2018-01-20 18:06 ` Ruediger Meier
  2018-01-20 18:06 ` [PATCH 3/5] build-sys: remove unneeded dependencies on bla.h.in Ruediger Meier
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Ruediger Meier @ 2018-01-20 18:06 UTC (permalink / raw)
  To: util-linux

From: Ruediger Meier <ruediger.meier@ga-group.nl>

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 libblkid/src/Makemodule.am     | 2 +-
 libfdisk/src/Makemodule.am     | 2 +-
 libmount/src/Makemodule.am     | 2 +-
 libsmartcols/src/Makemodule.am | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index b8843e896..f41f8383d 100644
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -1,7 +1,7 @@
 
 # blkid.h is generated, so it's store in builddir!
 blkidincdir = $(includedir)/blkid
-nodist_blkidinc_HEADERS = $(top_builddir)/libblkid/src/blkid.h
+nodist_blkidinc_HEADERS = libblkid/src/blkid.h
 
 usrlib_exec_LTLIBRARIES += libblkid.la
 libblkid_la_SOURCES = \
diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index 0e568381f..8ac19b60e 100644
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -1,7 +1,7 @@
 
 # libfdisk.h is generated, so it's stored in builddir!
 fdiskincdir = $(includedir)/libfdisk
-nodist_fdiskinc_HEADERS = $(top_builddir)/libfdisk/src/libfdisk.h
+nodist_fdiskinc_HEADERS = libfdisk/src/libfdisk.h
 
 usrlib_exec_LTLIBRARIES += libfdisk.la
 libfdisk_la_SOURCES = \
diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index 516bebbfa..9d693197b 100644
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -1,7 +1,7 @@
 
 # libmount.h is generated, so it's store in builddir!
 mountincdir = $(includedir)/libmount
-nodist_mountinc_HEADERS = $(top_builddir)/libmount/src/libmount.h
+nodist_mountinc_HEADERS = libmount/src/libmount.h
 
 usrlib_exec_LTLIBRARIES += libmount.la
 libmount_la_SOURCES = \
diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
index 2b1c1fd1c..62fdf1051 100644
--- a/libsmartcols/src/Makemodule.am
+++ b/libsmartcols/src/Makemodule.am
@@ -2,7 +2,7 @@
 
 # smartcols.h is generated, so it's stored in builddir!
 smartcolsincdir = $(includedir)/libsmartcols
-nodist_smartcolsinc_HEADERS = $(top_builddir)/libsmartcols/src/libsmartcols.h
+nodist_smartcolsinc_HEADERS = libsmartcols/src/libsmartcols.h
 
 usrlib_exec_LTLIBRARIES += libsmartcols.la
 libsmartcols_la_SOURCES= \
-- 
2.13.6


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 3/5] build-sys: remove unneeded dependencies on bla.h.in
  2018-01-20 18:06 [PATCH 0/5] some build-sys cosmetics Ruediger Meier
  2018-01-20 18:06 ` [PATCH 1/5] build-sys: remove generated headers from dist tar ball Ruediger Meier
  2018-01-20 18:06 ` [PATCH 2/5] build-sys: automake is able to find headers in builddir Ruediger Meier
@ 2018-01-20 18:06 ` Ruediger Meier
  2018-01-20 18:06 ` [PATCH 4/5] build-sys: avoid using prog_DEPENDENCIES Ruediger Meier
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Ruediger Meier @ 2018-01-20 18:06 UTC (permalink / raw)
  To: util-linux

From: Ruediger Meier <ruediger.meier@ga-group.nl>

We have already automakes's automatic dependencies like
  bla.h.in -> bla.h -> foo.o -> bar.la

An explicit direct dependency bla.h.in -> bar.la
is redundant and useless anyways.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 libblkid/src/Makemodule.am     | 3 +--
 libfdisk/src/Makemodule.am     | 3 +--
 libmount/src/Makemodule.am     | 3 +--
 libsmartcols/src/Makemodule.am | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index f41f8383d..2bd19959f 100644
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -115,8 +115,7 @@ libblkid_la_LIBADD = libcommon.la
 
 libblkid_la_DEPENDENCIES = \
 	libcommon.la \
-	libblkid/src/libblkid.sym \
-	libblkid/src/blkid.h.in
+	libblkid/src/libblkid.sym
 
 libblkid_la_CFLAGS = \
 	$(AM_CFLAGS) \
diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index 8ac19b60e..73bc89a95 100644
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -43,8 +43,7 @@ libfdisk_la_CFLAGS = \
 libfdisk_la_DEPENDENCIES = \
 	libcommon.la \
 	libuuid.la \
-	libfdisk/src/libfdisk.sym \
-	libfdisk/src/libfdisk.h.in
+	libfdisk/src/libfdisk.sym
 
 libfdisk_la_LDFLAGS = $(SOLIB_LDFLAGS)
 if HAVE_VSCRIPT
diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index 9d693197b..1a6a8374a 100644
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -55,8 +55,7 @@ libmount_la_CFLAGS = \
 libmount_la_DEPENDENCIES = \
 	libcommon.la \
 	libblkid.la \
-	libmount/src/libmount.sym \
-	libmount/src/libmount.h.in
+	libmount/src/libmount.sym
 
 libmount_la_LDFLAGS = $(SOLIB_LDFLAGS)
 if HAVE_VSCRIPT
diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
index 62fdf1051..6f5f6072c 100644
--- a/libsmartcols/src/Makemodule.am
+++ b/libsmartcols/src/Makemodule.am
@@ -29,8 +29,7 @@ libsmartcols_la_CFLAGS = \
 
 libsmartcols_la_DEPENDENCIES = \
 	libcommon.la \
-	libsmartcols/src/libsmartcols.sym \
-	libsmartcols/src/libsmartcols.h.in
+	libsmartcols/src/libsmartcols.sym
 
 libsmartcols_la_LDFLAGS = $(SOLIB_LDFLAGS)
 if HAVE_VSCRIPT
-- 
2.13.6


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 4/5] build-sys: avoid using prog_DEPENDENCIES
  2018-01-20 18:06 [PATCH 0/5] some build-sys cosmetics Ruediger Meier
                   ` (2 preceding siblings ...)
  2018-01-20 18:06 ` [PATCH 3/5] build-sys: remove unneeded dependencies on bla.h.in Ruediger Meier
@ 2018-01-20 18:06 ` Ruediger Meier
  2018-01-20 18:06 ` [PATCH 5/5] build-sys: remove redundant EXTRA_DIST files Ruediger Meier
  2018-01-22 10:28 ` [PATCH 0/5] some build-sys cosmetics Karel Zak
  5 siblings, 0 replies; 7+ messages in thread
From: Ruediger Meier @ 2018-01-20 18:06 UTC (permalink / raw)
  To: util-linux

From: Ruediger Meier <ruediger.meier@ga-group.nl>

Use EXTRA_prog_DEPENDENCIES to have the benefit
of automake's automatic prog_DEPENDENCIES.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 libblkid/src/Makemodule.am     | 4 +---
 libfdisk/src/Makemodule.am     | 5 +----
 libmount/src/Makemodule.am     | 4 +---
 libsmartcols/src/Makemodule.am | 3 +--
 libuuid/src/Makemodule.am      | 4 +++-
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index 2bd19959f..807cc21ee 100644
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -113,8 +113,7 @@ endif
 
 libblkid_la_LIBADD = libcommon.la
 
-libblkid_la_DEPENDENCIES = \
-	libcommon.la \
+EXTRA_libblkid_la_DEPENDENCIES = \
 	libblkid/src/libblkid.sym
 
 libblkid_la_CFLAGS = \
@@ -125,7 +124,6 @@ libblkid_la_CFLAGS = \
 
 if BUILD_LIBUUID
 libblkid_la_LIBADD += libuuid.la
-libblkid_la_DEPENDENCIES += libuuid.la
 libblkid_la_CFLAGS += -I$(ul_libuuid_incdir)
 endif
 
diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index 73bc89a95..77eed0bfb 100644
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -40,9 +40,7 @@ libfdisk_la_CFLAGS = \
 	-I$(ul_libfdisk_incdir) \
 	-I$(top_srcdir)/libfdisk/src
 
-libfdisk_la_DEPENDENCIES = \
-	libcommon.la \
-	libuuid.la \
+EXTRA_libfdisk_la_DEPENDENCIES = \
 	libfdisk/src/libfdisk.sym
 
 libfdisk_la_LDFLAGS = $(SOLIB_LDFLAGS)
@@ -54,7 +52,6 @@ libfdisk_la_LDFLAGS += -version-info $(LIBFDISK_VERSION_INFO)
 
 if BUILD_LIBBLKID
 libfdisk_la_LIBADD += libblkid.la
-libfdisk_la_DEPENDENCIES += libblkid.la
 libfdisk_la_CFLAGS += -I$(ul_libblkid_incdir)
 endif
 
diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index 1a6a8374a..8d7433255 100644
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -52,9 +52,7 @@ libmount_la_CFLAGS = \
 	-I$(ul_libmount_incdir) \
 	-I$(top_srcdir)/libmount/src
 
-libmount_la_DEPENDENCIES = \
-	libcommon.la \
-	libblkid.la \
+EXTRA_libmount_la_DEPENDENCIES = \
 	libmount/src/libmount.sym
 
 libmount_la_LDFLAGS = $(SOLIB_LDFLAGS)
diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
index 6f5f6072c..175f9f206 100644
--- a/libsmartcols/src/Makemodule.am
+++ b/libsmartcols/src/Makemodule.am
@@ -27,8 +27,7 @@ libsmartcols_la_CFLAGS = \
 	-I$(ul_libsmartcols_incdir) \
 	-I$(top_srcdir)/libsmartcols/src
 
-libsmartcols_la_DEPENDENCIES = \
-	libcommon.la \
+EXTRA_libsmartcols_la_DEPENDENCIES = \
 	libsmartcols/src/libsmartcols.sym
 
 libsmartcols_la_LDFLAGS = $(SOLIB_LDFLAGS)
diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
index a1c1e4ab3..5122622a5 100644
--- a/libuuid/src/Makemodule.am
+++ b/libuuid/src/Makemodule.am
@@ -28,7 +28,9 @@ libuuid_la_SOURCES = \
 	lib/md5.c \
 	lib/sha1.c
 
-libuuid_la_DEPENDENCIES = libuuid/src/libuuid.sym
+EXTRA_libuuid_la_DEPENDENCIES = \
+	libuuid/src/libuuid.sym
+
 libuuid_la_LIBADD       = $(SOCKET_LIBS)
 
 libuuid_la_CFLAGS = \
-- 
2.13.6


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 5/5] build-sys: remove redundant EXTRA_DIST files
  2018-01-20 18:06 [PATCH 0/5] some build-sys cosmetics Ruediger Meier
                   ` (3 preceding siblings ...)
  2018-01-20 18:06 ` [PATCH 4/5] build-sys: avoid using prog_DEPENDENCIES Ruediger Meier
@ 2018-01-20 18:06 ` Ruediger Meier
  2018-01-22 10:28 ` [PATCH 0/5] some build-sys cosmetics Karel Zak
  5 siblings, 0 replies; 7+ messages in thread
From: Ruediger Meier @ 2018-01-20 18:06 UTC (permalink / raw)
  To: util-linux

From: Ruediger Meier <ruediger.meier@ga-group.nl>

The sources of AC_CONFIG_FILES (*.in) are automatically
distributed.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 libblkid/Makemodule.am         | 2 +-
 libblkid/src/Makemodule.am     | 3 +--
 libfdisk/src/Makemodule.am     | 3 +--
 libmount/src/Makemodule.am     | 3 +--
 libsmartcols/src/Makemodule.am | 3 +--
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libblkid/Makemodule.am b/libblkid/Makemodule.am
index b4f6f9c4e..f1d1e8d00 100644
--- a/libblkid/Makemodule.am
+++ b/libblkid/Makemodule.am
@@ -11,6 +11,6 @@ endif
 pkgconfig_DATA += libblkid/blkid.pc
 PATHFILES      += libblkid/blkid.pc
 dist_man_MANS  += libblkid/libblkid.3
-EXTRA_DIST     += libblkid/libblkid.3 libblkid/COPYING
+EXTRA_DIST     += libblkid/COPYING
 
 endif # BUILD_LIBBLKID
diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index 807cc21ee..1046be100 100644
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -134,8 +134,7 @@ endif
 libblkid_la_LDFLAGS += -version-info $(LIBBLKID_VERSION_INFO)
 
 EXTRA_DIST += \
-	libblkid/src/libblkid.sym \
-	libblkid/src/blkid.h.in
+	libblkid/src/libblkid.sym
 
 if BUILD_LIBBLKID_TESTS
 check_PROGRAMS += \
diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index 77eed0bfb..d273551a2 100644
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -56,8 +56,7 @@ libfdisk_la_CFLAGS += -I$(ul_libblkid_incdir)
 endif
 
 EXTRA_DIST += \
-	libfdisk/src/libfdisk.sym \
-	libfdisk/src/libfdisk.h.in
+	libfdisk/src/libfdisk.sym
 
 if BUILD_LIBFDISK_TESTS
 check_PROGRAMS += \
diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index 8d7433255..a59b98b55 100644
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -63,8 +63,7 @@ libmount_la_LDFLAGS += -version-info $(LIBMOUNT_VERSION_INFO)
 
 
 EXTRA_DIST += \
-	libmount/src/libmount.sym \
-	libmount/src/libmount.h.in
+	libmount/src/libmount.sym
 
 if BUILD_LIBMOUNT_TESTS
 check_PROGRAMS += \
diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
index 175f9f206..664aca30b 100644
--- a/libsmartcols/src/Makemodule.am
+++ b/libsmartcols/src/Makemodule.am
@@ -37,8 +37,7 @@ endif
 libsmartcols_la_LDFLAGS += -version-info $(LIBSMARTCOLS_VERSION_INFO)
 
 EXTRA_DIST += \
-	libsmartcols/src/libsmartcols.sym \
-	libsmartcols/src/libsmartcols.h.in
+	libsmartcols/src/libsmartcols.sym
 
 # move lib from $(usrlib_execdir) to $(libdir) if needed
 install-exec-hook-libsmartcols:
-- 
2.13.6


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH 0/5] some build-sys cosmetics
  2018-01-20 18:06 [PATCH 0/5] some build-sys cosmetics Ruediger Meier
                   ` (4 preceding siblings ...)
  2018-01-20 18:06 ` [PATCH 5/5] build-sys: remove redundant EXTRA_DIST files Ruediger Meier
@ 2018-01-22 10:28 ` Karel Zak
  5 siblings, 0 replies; 7+ messages in thread
From: Karel Zak @ 2018-01-22 10:28 UTC (permalink / raw)
  To: Ruediger Meier; +Cc: util-linux

On Sat, Jan 20, 2018 at 07:06:19PM +0100, Ruediger Meier wrote:
> From: Ruediger Meier <ruediger.meier@ga-group.nl>
> 
> All these patches are more less just cosmetics. The first one
> "remove generated headers from dist tar ball" is the only
> one which should have a visable effect at all.
> 
> Ruediger Meier (5):
>   build-sys: remove generated headers from dist tar ball
>   build-sys: automake is able to find headers in builddir ...
>   build-sys: remove unneeded dependencies on bla.h.in
>   build-sys: avoid using prog_DEPENDENCIES
>   build-sys: remove redundant EXTRA_DIST files

 make distcheck
 make install DESTDIR=somewhere

pass, so you have to be right :-) Applied, thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-01-22 10:28 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-20 18:06 [PATCH 0/5] some build-sys cosmetics Ruediger Meier
2018-01-20 18:06 ` [PATCH 1/5] build-sys: remove generated headers from dist tar ball Ruediger Meier
2018-01-20 18:06 ` [PATCH 2/5] build-sys: automake is able to find headers in builddir Ruediger Meier
2018-01-20 18:06 ` [PATCH 3/5] build-sys: remove unneeded dependencies on bla.h.in Ruediger Meier
2018-01-20 18:06 ` [PATCH 4/5] build-sys: avoid using prog_DEPENDENCIES Ruediger Meier
2018-01-20 18:06 ` [PATCH 5/5] build-sys: remove redundant EXTRA_DIST files Ruediger Meier
2018-01-22 10:28 ` [PATCH 0/5] some build-sys cosmetics Karel Zak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).