Now that the sizeof checks are gone, we can stop generating platform_defs.h.
The only caveat is that we need to stop undefining ENABLE_GETTEXT, which the
generation process had removed before. The actual ENABLE_GETTEXT will be
passd on the compiler command line, just like other ENABLE or HAVE values
from autoconf.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
Makefile | 15 ++++-----------
configure.ac | 1 -
include/{platform_defs.h.in => platform_defs.h} | 1 -
3 files changed, 4 insertions(+), 13 deletions(-)
rename include/{platform_defs.h.in => platform_defs.h} (99%)
diff --git a/Makefile b/Makefile
index c12df98db..4e768526c 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)
@@ -76,7 +76,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
@@ -116,13 +116,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)
@@ -146,14 +139,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 8e7e8b2ed..127bd90ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,6 @@ AC_PREREQ([2.69])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([include/libxfs.h])
-AC_CONFIG_HEADERS([include/platform_defs.h])
AC_PREFIX_DEFAULT(/usr)
AC_PROG_INSTALL
diff --git a/include/platform_defs.h.in b/include/platform_defs.h
similarity index 99%
rename from include/platform_defs.h.in
rename to include/platform_defs.h
index dce7154cd..c01d4c426 100644
--- a/include/platform_defs.h.in
+++ b/include/platform_defs.h
@@ -31,7 +31,6 @@
typedef unsigned short umode_t;
/* Define if you want gettext (I18N) support */
-#undef ENABLE_GETTEXT
#ifdef ENABLE_GETTEXT
# include <libintl.h>
# define _(x) gettext(x)
--
2.39.2
