From 0fb1bf6586dc1d24d384d64cc2b32afb9e165332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Wed, 6 Apr 2022 03:12:33 +0200 Subject: [PATCH] libspl: include: remove [util/]sscanf.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unused, empty, installs in a weird location Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #13316 --- configure.ac | 1 - lib/libspl/include/Makefile.am | 2 +- lib/libspl/include/util/Makefile.am | 3 --- lib/libspl/include/util/sscanf.h | 30 ----------------------------- 4 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 lib/libspl/include/util/Makefile.am delete mode 100644 lib/libspl/include/util/sscanf.h diff --git a/configure.ac b/configure.ac index 5240a49591..26cdc8c67f 100644 --- a/configure.ac +++ b/configure.ac @@ -155,7 +155,6 @@ AC_CONFIG_FILES([ lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/dktp/Makefile - lib/libspl/include/util/Makefile lib/libtpool/Makefile lib/libunicode/Makefile lib/libuutil/Makefile diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am index 2099636603..601fbb77f6 100644 --- a/lib/libspl/include/Makefile.am +++ b/lib/libspl/include/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = rpc sys util os +SUBDIRS = rpc sys os libspldir = $(includedir)/libspl libspl_HEADERS = \ diff --git a/lib/libspl/include/util/Makefile.am b/lib/libspl/include/util/Makefile.am deleted file mode 100644 index ab553bc803..0000000000 --- a/lib/libspl/include/util/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -libspldir = $(includedir)/libspl -libspl_HEADERS = \ - sscanf.h diff --git a/lib/libspl/include/util/sscanf.h b/lib/libspl/include/util/sscanf.h deleted file mode 100644 index ead36acaba..0000000000 --- a/lib/libspl/include/util/sscanf.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#ifndef _LIBSPL_UTIL_SSCANF_H -#define _LIBSPL_UTIL_SSCANF_H - -#endif