Shaders: renamed magnumShadersResourceImport.hpp to resourceImport.hpp.

No need to duplicate the namespaces in filename. The old file is alias
to new one, is marked as deprecated and will be removed in future
release.

src/Magnum/Shaders/CMakeLists.txt

@@ -47,7 +47,11 @@ set(MagnumShaders_HEADERS
     visibility.h)
 
 if(BUILD_STATIC)
-    set(MagnumShaders_HEADERS ${MagnumShaders_HEADERS} magnumShadersResourceImport.hpp)
+    set(MagnumShaders_HEADERS ${MagnumShaders_HEADERS} resourceImport.hpp)
+
+    if(BUILD_DEPRECATED)
+        set(MagnumShaders_HEADERS ${MagnumShaders_HEADERS} magnumShadersResourceImport.hpp)
+    endif()
 endif()
 
 add_library(MagnumShaders ${SHARED_OR_STATIC} ${MagnumShaders_SRCS})

src/Magnum/Shaders/magnumShadersResourceImport.hpp

@@ -27,13 +27,13 @@
 #include "Magnum/configure.h"
 
 #ifdef MAGNUM_BUILD_STATIC
-#include <Corrade/Utility/Resource.h>
+#ifdef MAGNUM_BUILD_DEPRECATED
-#include <Corrade/Utility/Macros.h>
+#include "Magnum/Shaders/resourceImport.h"
-
+#else
-static int magnumShadersResourceImport() {
+#error use Magnum/Shaders/resourceImport.h instead
-    CORRADE_RESOURCE_INITIALIZE(MagnumShaders_RCS)
+#endif
-    return 0;
+#else
-} CORRADE_AUTOMATIC_INITIALIZER(magnumShadersResourceImport)
+#error this header is available only in static build
 #endif
 
 #endif

src/Magnum/Shaders/resourceImport.hpp

@@ -0,0 +1,41 @@
+#ifndef Magnum_Shaders_resourceImport_hpp
+#define Magnum_Shaders_resourceImport_hpp
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+#include "Magnum/configure.h"
+
+#ifdef MAGNUM_BUILD_STATIC
+#include <Corrade/Utility/Resource.h>
+#include <Corrade/Utility/Macros.h>
+
+static int magnumShadersResourceImport() {
+    CORRADE_RESOURCE_INITIALIZE(MagnumShaders_RCS)
+    return 0;
+} CORRADE_AUTOMATIC_INITIALIZER(magnumShadersResourceImport)
+#else
+#error this header is available only in static build
+#endif
+
+#endif