xfsprogs: remove PKG_PLATFORM macro

Now that there is only one supported platform (Linux), remove
the PKG_PLATFORM macro.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/Makefile b/include/Makefile
index e6aa9b2f387b07bcba89308cfb364d02398a5053..7b922420f4cad954d2007f11fe913d0c41bf8541 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -35,14 +35,12 @@ LIBHFILES = libxfs.h \
 
 HFILES = handle.h \
        jdm.h \
-       $(PKG_PLATFORM).h \
+       linux.h \
        xfs.h \
        xqm.h \
        xfs_arch.h
 
-PHFILES = linux.h
-LSRCFILES = $(shell echo $(PHFILES) | sed -e "s/$(PKG_PLATFORM).h//g")
-LSRCFILES += platform_defs.h.in builddefs.in buildmacros buildrules install-sh
+LSRCFILES = platform_defs.h.in builddefs.in buildmacros buildrules install-sh
 LSRCFILES += $(DKHFILES) $(LIBHFILES)
 LDIRT = disk
 LDIRDIRT = xfs
@@ -56,7 +54,7 @@ disk:
 include $(BUILDRULES)
 
 # set up include/xfs header directory
-install-headers: $(addsuffix -hdrs, $(PHFILES) $(DKHFILES) $(HFILES))
+install-headers: $(addsuffix -hdrs, $(DKHFILES) $(HFILES))
 
 %-hdrs:
        $(Q)$(LN_S) -f $(CURDIR)/$* xfs/$*

diff --git a/include/builddefs.in b/include/builddefs.in
index 261ae5e1931e83912baf4fb3ccc600d375349c73..7ad5b3d020f12d7046eec34757827d3e141a3f18 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -35,7 +35,6 @@ PKG_USER      = @pkg_user@
 PKG_GROUP      = @pkg_group@
 PKG_RELEASE    = @pkg_release@
 PKG_VERSION    = @pkg_version@
-PKG_PLATFORM   = @pkg_platform@
 PKG_DISTRIBUTION= @pkg_distribution@
 
 prefix         = @prefix@
@@ -121,13 +120,11 @@ CROND_DIR = @crond_dir@
 GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall
 #         -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-decl
 
-ifeq ($(PKG_PLATFORM),linux)
 PCFLAGS = -D_GNU_SOURCE $(GCCFLAGS)
 ifeq ($(HAVE_UMODE_T),yes)
 PCFLAGS += -DHAVE_UMODE_T
 endif
 DEPENDFLAGS = -D__linux__
-endif
 ifeq ($(HAVE_FLS),yes)
 LCFLAGS+= -DHAVE_FLS
 endif

diff --git a/io/Makefile b/io/Makefile
index 1498fc58ca7222a66093156af15deba0dfdf84f2..6270fc163ed3e592b62365244dbdb7f327f7b96b 100644 (file)
--- a/io/Makefile
+++ b/io/Makefile
@@ -108,11 +108,9 @@ LCFLAGS += -DHAVE_DEVMAPPER
 endif
 
 # On linux we get fsmap from the system or define it ourselves
-# so include this based on platform type.  If this reverts to only
-# the autoconf check w/o local definition, change to testing HAVE_GETFSMAP
-ifeq ($(PKG_PLATFORM),linux)
+# so include this unconditionally.  If this reverts to only
+# the autoconf check w/o local definition, test HAVE_GETFSMAP
 CFILES += fsmap.c
-endif
 
 ifeq ($(HAVE_STATFS_FLAGS),yes)
 LCFLAGS += -DHAVE_STATFS_FLAGS

diff --git a/libfrog/Makefile b/libfrog/Makefile
index 8e4daedc927eb43d5cd77d9c6f56cca98b07f78e..dbff9596e4abf7e4e67afc3feb239a2a2c427d26 100644 (file)
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -16,6 +16,7 @@ convert.c \
 crc32.c \
 fsgeom.c \
 list_sort.c \
+linux.c \
 paths.c \
 projects.c \
 ptvar.c \
@@ -30,10 +31,6 @@ crc32table.h
 
 LSRCFILES += gen_crc32table.c
 
-CFILES += $(PKG_PLATFORM).c
-PCFILES = linux.c
-LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
-
 ifeq ($(HAVE_GETMNTENT),yes)
 LCFLAGS += -DHAVE_GETMNTENT
 endif

diff --git a/m4/package_globals.m4 b/m4/package_globals.m4
index e469671c8dea20c8f88175a1a745d6e760943b17..892e3bdbfbd3ade0f0927660e8e969a9cf0327f2 100644 (file)
--- a/m4/package_globals.m4
+++ b/m4/package_globals.m4
@@ -40,8 +40,4 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     pkg_distribution=`uname -s`
     test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
     AC_SUBST(pkg_distribution)
-
-    pkg_platform=`uname -s | tr 'A-Z' 'a-z' | tr -d / | sed -e 's/irix64/irix/'`
-    test -z "$PLATFORM" || pkg_platform="$PLATFORM"
-    AC_SUBST(pkg_platform)
   ])

diff --git a/quota/Makefile b/quota/Makefile
index 85e279b4d2ee5335fe9a2e000a5c791eeec88508..384f023ad1675907066b48808c0d8c903821d44f 100644 (file)
--- a/quota/Makefile
+++ b/quota/Makefile
@@ -8,11 +8,7 @@ include $(TOPDIR)/include/builddefs
 LTCOMMAND = xfs_quota
 HFILES = init.h quota.h
 CFILES = init.c util.c \
-       edit.c free.c path.c project.c quot.c quota.c report.c state.c
-
-CFILES += $(PKG_PLATFORM).c
-PCFILES = linux.c
-LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
+       edit.c free.c linux.c path.c project.c quot.c quota.c report.c state.c
 
 LLDLIBS = $(LIBXCMD) $(LIBFROG)
 LTDEPENDENCIES = $(LIBXCMD) $(LIBFROG)

diff --git a/scrub/Makefile b/scrub/Makefile
index 4a9e36d0bb688e013e3fa70764c47ef28fa5c386..aebc7e437e61ff7f4ed6e376426ef1760993bdc3 100644 (file)
--- a/scrub/Makefile
+++ b/scrub/Makefile
@@ -8,9 +8,9 @@ include $(TOPDIR)/include/builddefs
 # On linux we get fsmap from the system or define it ourselves
 # so include this based on platform type.  If this reverts to only
 # the autoconf check w/o local definition, change to testing HAVE_GETFSMAP
-SCRUB_PREREQS=$(PKG_PLATFORM)$(HAVE_OPENAT)$(HAVE_FSTATAT)
+SCRUB_PREREQS=$(HAVE_OPENAT)$(HAVE_FSTATAT)
 
-ifeq ($(SCRUB_PREREQS),linuxyesyes)
+ifeq ($(SCRUB_PREREQS),yesyes)
 LTCOMMAND = xfs_scrub
 INSTALL_SCRUB = install-scrub
 XFS_SCRUB_ALL_PROG = xfs_scrub_all

diff --git a/spaceman/Makefile b/spaceman/Makefile
index 87614d9e6a1f27616358556b82d8d8b5f47c261f..b1c1b16d51a0896547e4b8b646de8ce52e9129ef 100644 (file)
--- a/spaceman/Makefile
+++ b/spaceman/Makefile
@@ -23,11 +23,9 @@ LLDLIBS += $(LIBEDITLINE) $(LIBTERMCAP)
 endif
 
 # On linux we get fsmap from the system or define it ourselves
-# so include this based on platform type.  If this reverts to only
-# the autoconf check w/o local definition, change to testing HAVE_GETFSMAP
-ifeq ($(PKG_PLATFORM),linux)
+# so include this unconditionally.  If this reverts to only
+# the autoconf check w/o local definition, test HAVE_GETFSMAP
 CFILES += freesp.c
-endif
 
 default: depend $(LTCOMMAND)