[5/5] xfsprogs: stop generating platform_defs.h
diff mbox series

Message ID 20200126113541.787884-6-hch@lst.de
State Superseded
Headers show
Series
  • [1/5] xfsprogs: remove the ENABLE_GETTEXT substitution in platform_defs.h.in
Related show

Commit Message

Christoph Hellwig Jan. 26, 2020, 11:35 a.m. UTC
Now that all the autoconf substituations are gone, there is no need
to generate this (and thus any) header.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 .gitignore                                      |  1 -
 Makefile                                        | 15 ++++-----------
 configure.ac                                    |  1 -
 debian/rules                                    |  2 --
 include/Makefile                                |  2 +-
 include/{platform_defs.h.in => platform_defs.h} |  0
 6 files changed, 5 insertions(+), 16 deletions(-)
 rename include/{platform_defs.h.in => platform_defs.h} (100%)

Comments

Darrick J. Wong Jan. 26, 2020, 10:21 p.m. UTC | #1
On Sun, Jan 26, 2020 at 12:35:41PM +0100, Christoph Hellwig wrote:
> Now that all the autoconf substituations are gone, there is no need
> to generate this (and thus any) header.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Seems fine to me,

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  .gitignore                                      |  1 -
>  Makefile                                        | 15 ++++-----------
>  configure.ac                                    |  1 -
>  debian/rules                                    |  2 --
>  include/Makefile                                |  2 +-
>  include/{platform_defs.h.in => platform_defs.h} |  0
>  6 files changed, 5 insertions(+), 16 deletions(-)
>  rename include/{platform_defs.h.in => platform_defs.h} (100%)
> 
> diff --git a/.gitignore b/.gitignore
> index fd131b6f..20d033ae 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -6,7 +6,6 @@
>  # build system
>  .census
>  .gitcensus
> -/include/platform_defs.h
>  /include/builddefs
>  /install-sh
>  
> diff --git a/Makefile b/Makefile
> index 0edc2700..ff6a977d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -49,7 +49,7 @@ SRCTARINC = m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
>             m4/ltversion.m4 po/xfsprogs.pot .gitcensus $(CONFIGURE)
>  LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
>  	conftest* built .census install.* install-dev.* *.gz *.xz \
> -	autom4te.cache/* libtool include/builddefs include/platform_defs.h
> +	autom4te.cache/* libtool include/builddefs
>  
>  ifeq ($(HAVE_BUILDDEFS), yes)
>  LDIRDIRT = $(SRCDIR)
> @@ -84,7 +84,7 @@ endif
>  # include is listed last so it is processed last in clean rules.
>  SUBDIRS = $(LIBFROG_SUBDIR) $(LIB_SUBDIRS) $(TOOL_SUBDIRS) include
>  
> -default: include/builddefs include/platform_defs.h
> +default: include/builddefs
>  ifeq ($(HAVE_BUILDDEFS), no)
>  	$(Q)$(MAKE) $(MAKEOPTS) -C . $@
>  else
> @@ -130,13 +130,6 @@ configure: configure.ac
>  include/builddefs: configure
>  	./configure $$LOCAL_CONFIGURE_OPTIONS
>  
> -include/platform_defs.h: include/builddefs
> -## Recover from the removal of $@
> -	@if test -f $@; then :; else \
> -		rm -f include/builddefs; \
> -		$(MAKE) $(MAKEOPTS) $(AM_MAKEFLAGS) include/builddefs; \
> -	fi
> -
>  install: $(addsuffix -install,$(SUBDIRS))
>  	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
>  	$(INSTALL) -m 644 README $(PKG_DOC_DIR)
> @@ -160,14 +153,14 @@ realclean: distclean
>  #
>  # All this gunk is to allow for a make dist on an unconfigured tree
>  #
> -dist: include/builddefs include/platform_defs.h default
> +dist: include/builddefs default
>  ifeq ($(HAVE_BUILDDEFS), no)
>  	$(Q)$(MAKE) $(MAKEOPTS) -C . $@
>  else
>  	$(Q)$(MAKE) $(MAKEOPTS) $(SRCTAR)
>  endif
>  
> -deb: include/builddefs include/platform_defs.h
> +deb: include/builddefs
>  ifeq ($(HAVE_BUILDDEFS), no)
>  	$(Q)$(MAKE) $(MAKEOPTS) -C . $@
>  else
> diff --git a/configure.ac b/configure.ac
> index 5eb7c14b..49c3a466 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -3,7 +3,6 @@ AC_PREREQ(2.50)
>  AC_CONFIG_AUX_DIR([.])
>  AC_CONFIG_MACRO_DIR([m4])
>  AC_CONFIG_SRCDIR([include/libxfs.h])
> -AC_CONFIG_HEADER(include/platform_defs.h)
>  AC_PREFIX_DEFAULT(/usr)
>  
>  AC_PROG_INSTALL
> diff --git a/debian/rules b/debian/rules
> index e8509fb3..41c0c004 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -43,14 +43,12 @@ config: .census
>  	@echo "== dpkg-buildpackage: configure" 1>&2
>  	$(checkdir)
>  	AUTOHEADER=/bin/true dh_autoreconf
> -	$(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h
>  	touch .census
>  
>  dibuild:
>  	$(checkdir)
>  	@echo "== dpkg-buildpackage: installer" 1>&2
>  	if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \
> -		$(diopts) $(MAKE) include/platform_defs.h; \
>  		mkdir -p include/xfs; \
>  		for dir in include libxfs; do \
>  			$(MAKE) $(PMAKEFLAGS) -C $$dir NODEP=1 install-headers; \
> diff --git a/include/Makefile b/include/Makefile
> index a80867e4..c92ecbd5 100644
> --- a/include/Makefile
> +++ b/include/Makefile
> @@ -37,7 +37,7 @@ HFILES = handle.h \
>  	xqm.h \
>  	xfs_arch.h
>  
> -LSRCFILES = platform_defs.h.in builddefs.in buildmacros buildrules install-sh
> +LSRCFILES = builddefs.in buildmacros buildrules install-sh
>  LSRCFILES += $(DKHFILES) $(LIBHFILES)
>  LDIRT = disk
>  LDIRDIRT = xfs
> diff --git a/include/platform_defs.h.in b/include/platform_defs.h
> similarity index 100%
> rename from include/platform_defs.h.in
> rename to include/platform_defs.h
> -- 
> 2.24.1
>

Patch
diff mbox series

diff --git a/.gitignore b/.gitignore
index fd131b6f..20d033ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@ 
 # build system
 .census
 .gitcensus
-/include/platform_defs.h
 /include/builddefs
 /install-sh
 
diff --git a/Makefile b/Makefile
index 0edc2700..ff6a977d 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@  SRCTARINC = m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
            m4/ltversion.m4 po/xfsprogs.pot .gitcensus $(CONFIGURE)
 LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
 	conftest* built .census install.* install-dev.* *.gz *.xz \
-	autom4te.cache/* libtool include/builddefs include/platform_defs.h
+	autom4te.cache/* libtool include/builddefs
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 LDIRDIRT = $(SRCDIR)
@@ -84,7 +84,7 @@  endif
 # include is listed last so it is processed last in clean rules.
 SUBDIRS = $(LIBFROG_SUBDIR) $(LIB_SUBDIRS) $(TOOL_SUBDIRS) include
 
-default: include/builddefs include/platform_defs.h
+default: include/builddefs
 ifeq ($(HAVE_BUILDDEFS), no)
 	$(Q)$(MAKE) $(MAKEOPTS) -C . $@
 else
@@ -130,13 +130,6 @@  configure: configure.ac
 include/builddefs: configure
 	./configure $$LOCAL_CONFIGURE_OPTIONS
 
-include/platform_defs.h: include/builddefs
-## Recover from the removal of $@
-	@if test -f $@; then :; else \
-		rm -f include/builddefs; \
-		$(MAKE) $(MAKEOPTS) $(AM_MAKEFLAGS) include/builddefs; \
-	fi
-
 install: $(addsuffix -install,$(SUBDIRS))
 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
 	$(INSTALL) -m 644 README $(PKG_DOC_DIR)
@@ -160,14 +153,14 @@  realclean: distclean
 #
 # All this gunk is to allow for a make dist on an unconfigured tree
 #
-dist: include/builddefs include/platform_defs.h default
+dist: include/builddefs default
 ifeq ($(HAVE_BUILDDEFS), no)
 	$(Q)$(MAKE) $(MAKEOPTS) -C . $@
 else
 	$(Q)$(MAKE) $(MAKEOPTS) $(SRCTAR)
 endif
 
-deb: include/builddefs include/platform_defs.h
+deb: include/builddefs
 ifeq ($(HAVE_BUILDDEFS), no)
 	$(Q)$(MAKE) $(MAKEOPTS) -C . $@
 else
diff --git a/configure.ac b/configure.ac
index 5eb7c14b..49c3a466 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,6 @@  AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([include/libxfs.h])
-AC_CONFIG_HEADER(include/platform_defs.h)
 AC_PREFIX_DEFAULT(/usr)
 
 AC_PROG_INSTALL
diff --git a/debian/rules b/debian/rules
index e8509fb3..41c0c004 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,14 +43,12 @@  config: .census
 	@echo "== dpkg-buildpackage: configure" 1>&2
 	$(checkdir)
 	AUTOHEADER=/bin/true dh_autoreconf
-	$(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h
 	touch .census
 
 dibuild:
 	$(checkdir)
 	@echo "== dpkg-buildpackage: installer" 1>&2
 	if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \
-		$(diopts) $(MAKE) include/platform_defs.h; \
 		mkdir -p include/xfs; \
 		for dir in include libxfs; do \
 			$(MAKE) $(PMAKEFLAGS) -C $$dir NODEP=1 install-headers; \
diff --git a/include/Makefile b/include/Makefile
index a80867e4..c92ecbd5 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -37,7 +37,7 @@  HFILES = handle.h \
 	xqm.h \
 	xfs_arch.h
 
-LSRCFILES = platform_defs.h.in builddefs.in buildmacros buildrules install-sh
+LSRCFILES = builddefs.in buildmacros buildrules install-sh
 LSRCFILES += $(DKHFILES) $(LIBHFILES)
 LDIRT = disk
 LDIRDIRT = xfs
diff --git a/include/platform_defs.h.in b/include/platform_defs.h
similarity index 100%
rename from include/platform_defs.h.in
rename to include/platform_defs.h