From 1f88e4a690d448fcc014da4ccac9abd15c5ea43d Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Sat, 15 Oct 2022 11:05:15 +0200 Subject: [PATCH] remove empty matroska/c headers We're not going to make a C wrapper for libmatroska. --- CMakeLists.txt | 7 +---- matroska/KaxTypes.h | 1 - matroska/c/libmatroska.h | 57 -------------------------------------- matroska/c/libmatroska_t.h | 47 ------------------------------- 4 files changed, 1 insertion(+), 111 deletions(-) delete mode 100644 matroska/c/libmatroska.h delete mode 100644 matroska/c/libmatroska_t.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bcb8ca..616425e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,11 +59,7 @@ set(libmatroska_PUBLIC_HEADERS matroska/KaxTypes.h matroska/KaxVersion.h) -set (libmatroska_C_PUBLIC_HEADERS - matroska/c/libmatroska.h - matroska/c/libmatroska_t.h) - -add_library(matroska ${libmatroska_SOURCES} ${libmatroska_PUBLIC_HEADERS} ${libmatroska_C_PUBLIC_HEADERS}) +add_library(matroska ${libmatroska_SOURCES} ${libmatroska_PUBLIC_HEADERS}) target_link_libraries(matroska PUBLIC EBML::ebml) set_target_properties(matroska PROPERTIES VERSION 8.0.0 @@ -99,7 +95,6 @@ install(TARGETS matroska LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${libmatroska_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/matroska) -install(FILES ${libmatroska_C_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/matroska/c) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/matroska_export.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/matroska) if(NOT DISABLE_PKGCONFIG) diff --git a/matroska/KaxTypes.h b/matroska/KaxTypes.h index 698504e..4680667 100644 --- a/matroska/KaxTypes.h +++ b/matroska/KaxTypes.h @@ -36,7 +36,6 @@ #include "matroska/KaxConfig.h" #include -#include "matroska/c/libmatroska_t.h" /*! \enum track_type diff --git a/matroska/c/libmatroska.h b/matroska/c/libmatroska.h deleted file mode 100644 index a850973..0000000 --- a/matroska/c/libmatroska.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** libmatroska : parse Matroska files, see http://www.matroska.org/ -** -** -** -** Copyright (C) 2002-2003 Steve Lhomme. All rights reserved. -** -** This file is part of libmatroska. -** -** This library is free software; you can redistribute it and/or -** modify it under the terms of the GNU Lesser General Public -** License as published by the Free Software Foundation; either -** version 2.1 of the License, or (at your option) any later version. -** -** This library is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** Lesser General Public License for more details. -** -** You should have received a copy of the GNU Lesser General Public -** License along with this library; if not, write to the Free Software -** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -** -** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information. -** -** Contact license@matroska.org if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - -/*! - \file libmatroska.h - \version \$Id: libmatroska.h,v 1.2 2004/04/14 23:26:17 robux4 Exp $ - \author Steve Lhomme - \author Ingo Ralf Blum - - \brief C API to the libmatroska library - \note These are the functions that should be exported (visible from outisde the library) - \todo Put a function here for all the MUST in the Matroska spec - \todo Put a brief description of each function, and a description of the params and return value - \todo Change the int values to sized types -*/ - -#ifndef _LIBMATROSKA_H_INCLUDED_ -#define _LIBMATROSKA_H_INCLUDED_ - -#include "libmatroska_t.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* _LIBMATROSKA_H_INCLUDED_ */ diff --git a/matroska/c/libmatroska_t.h b/matroska/c/libmatroska_t.h deleted file mode 100644 index 4373d00..0000000 --- a/matroska/c/libmatroska_t.h +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** libmatroska : parse Matroska files, see http://www.matroska.org/ -** -** -** -** Copyright (C) 2002-2003 Steve Lhomme. All rights reserved. -** -** This file is part of libmatroska. -** -** This library is free software; you can redistribute it and/or -** modify it under the terms of the GNU Lesser General Public -** License as published by the Free Software Foundation; either -** version 2.1 of the License, or (at your option) any later version. -** -** This library is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** Lesser General Public License for more details. -** -** You should have received a copy of the GNU Lesser General Public -** License along with this library; if not, write to the Free Software -** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -** -** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.** -** Contact license@matroska.org if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - -/*! - \file libmatroska_t.h - \version \$Id: libmatroska_t.h,v 1.3 2004/04/14 23:26:17 robux4 Exp $ - \author Steve Lhomme - \author Ingo Ralf Blum - - \brief Misc type definitions for the C API of libmatroska - - \note These types should be compiler/language independant (just platform dependant) - \todo recover the sized types (std::uint16_t, std::int32_t, etc) here too (or maybe here only) -*/ - -#ifndef _LIBMATROSKA_T_H_INCLUDED_ -#define _LIBMATROSKA_T_H_INCLUDED_ - -#include - -#endif /* _LIBMATROSKA_T_H_INCLUDED_ */ -- 2.50.1