remove some useless things from 3rdparty/boost

Remove

1/ the libs/ directory

2/ the CMakeList.txt file, since it only mentions this directory

3/ the cstdint.hpp file in extract.sh, since we do not use this header
   file directly (should not make a difference, boost uses it in other
   places).

Update boost/Makefile.am accordingly.

diff --git a/3rdparty/boost/CMakeLists.txt b/3rdparty/boost/CMakeLists.txt
deleted file mode 100644 (file)
index 6d7839a..0000000
--- a/3rdparty/boost/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is part of LyX, the document processor.
-# Licence details can be found in the file COPYING.
-#
-# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
-#
-
-add_subdirectory(libs) 
-

diff --git a/3rdparty/boost/Makefile.am b/3rdparty/boost/Makefile.am
index ff8fa4bc7587555bb3ae1ea03f28849349e67fda..431ba238c3f7ca82208cc53856c745941a90b68c 100644 (file)
--- a/3rdparty/boost/Makefile.am
+++ b/3rdparty/boost/Makefile.am
@@ -1,12 +1,5 @@
 include $(top_srcdir)/config/common.am
 
 EXTRA_DIST = boost \
-       CMakeLists.txt \
-       LICENSE_1_0.txt \
-       libs/CMakeLists.txt \
-       libs/regex/CMakeLists.txt \
-       libs/regex/src/CMakeLists.txt
-
-AM_CPPFLAGS += -DBOOST_USER_CONFIG="<config.h>" 
-AM_CPPFLAGS +=  $(BOOST_INCLUDES)
+       LICENSE_1_0.txt
 

diff --git a/3rdparty/boost/extract.sh b/3rdparty/boost/extract.sh
index 8a1e70e25ed77556fe1372a066ec2422d5c94753..bdc0a69d671a4c5701530bd8d442b8d889675834 100755 (executable)
--- a/3rdparty/boost/extract.sh
+++ b/3rdparty/boost/extract.sh
@@ -5,7 +5,7 @@
 #
 # http://www.boost.org/doc/libs/1_47_0/tools/bcp/doc/html/index.html
 #
-# Does also work with an outdated bcp version 
+# Does also work with an outdated bcp version
 #
 # Usage: extract.sh <path to new boost version>
 #
@@ -23,7 +23,6 @@ bcp --boost=$1 \
        boost/any.hpp \
        boost/assert.hpp \
        boost/crc.hpp \
-       boost/cstdint.hpp \
        boost/lexical_cast.hpp \
        boost/signals2.hpp \
        boost/signals2/connection.hpp \

diff --git a/3rdparty/boost/libs/README b/3rdparty/boost/libs/README
deleted file mode 100644 (file)
index 8ec6c04..0000000
--- a/3rdparty/boost/libs/README
+++ /dev/null
@@ -1 +0,0 @@
-This is just a placeholder. We will put boost cpp files here when we need them.

diff --git a/3rdparty/boost/libs/regex/src/internals.hpp b/3rdparty/boost/libs/regex/src/internals.hpp
deleted file mode 100644 (file)
index 3a15cc6..0000000
--- a/3rdparty/boost/libs/regex/src/internals.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- * Copyright (c) 2011
- * John Maddock
- *
- * Use, modification and distribution are subject to the 
- * Boost Software License, Version 1.0. (See accompanying file 
- * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- *
- */
-
-#ifndef BOOST_REGEX_SRC_INTERNALS_HPP
-#define BOOST_REGEX_SRC_INTERNALS_HPP
-
-enum
-{
-   char_class_space=1<<0, 
-   char_class_print=1<<1, 
-   char_class_cntrl=1<<2, 
-   char_class_upper=1<<3, 
-   char_class_lower=1<<4,
-   char_class_alpha=1<<5, 
-   char_class_digit=1<<6, 
-   char_class_punct=1<<7, 
-   char_class_xdigit=1<<8,
-   char_class_alnum=char_class_alpha|char_class_digit, 
-   char_class_graph=char_class_alnum|char_class_punct,
-   char_class_blank=1<<9,
-   char_class_word=1<<10,
-   char_class_unicode=1<<11,
-   char_class_horizontal=1<<12,
-   char_class_vertical=1<<13
-};
-
-#endif // BOOST_REGEX_SRC_INTERNALS_HPP