-I$(dir $(3)) in gb_CObject__command_pattern is no longer needed

...at least in com_GCC_class.mk (com_MSC_class.mk will be addressed in a follow-
up commit), after the recent loplugin:includeform clean-up.

Two static libraries built from external sources needed adjustment, two
compilerplugin tests needed adjustment (which wasn't found by
loplugin:includeform, by design), and one more adjustment in
sal/textenc/generate/.

Change-Id: Idad5ae355a02ae130369a9a45b5f5925ab48ffef
Reviewed-on: https://gerrit.libreoffice.org/44174
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2017-11-01 18:16:40 +01:00
parent b085d3561a
commit ecbaf98062
6 changed files with 9 additions and 4 deletions

View File

@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <externvar.hxx>
#include "externvar.hxx"
int v1;
int v2; // expected-error {{variable with external linkage not declared in an include file [loplugin:externvar]}} expected-note {{should either have internal linkage or be declared in an include file [loplugin:externvar]}}

View File

@@ -11,7 +11,7 @@
#include <salhelper/simplereferenceobject.hxx>
#include <unnecessaryoverride-dtor.hxx>
#include "unnecessaryoverride-dtor.hxx"
struct NonVirtualBase {};

View File

@@ -15,6 +15,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,graphite))
$(eval $(call gb_StaticLibrary_set_include,graphite,\
-I$(call gb_UnpackedTarball_get_dir,graphite/include) \
-I$(call gb_UnpackedTarball_get_dir,graphite/src) \
$$(INCLUDE) \
))

View File

@@ -23,6 +23,11 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,libcmis,\
))
endif
$(eval $(call gb_StaticLibrary_set_include,libcmis, \
-I$(call gb_UnpackedTarball_get_dir,libcmis/src/libcmis) \
$$(INCLUDE) \
))
$(eval $(call gb_StaticLibrary_use_unpacked,libcmis,libcmis))
$(eval $(call gb_StaticLibrary_use_externals,libcmis,\

View File

@@ -20,7 +20,7 @@
#include <sal/types.h>
#include <convertgb18030.hxx>
#include "../convertgb18030.hxx"
static sal_Unicode const aImplGb180302000ToUnicodeData[] = {
0x4E02,0x4E04,0x4E05,0x4E06,0x4E0F,0x4E12,0x4E17,0x4E1F,

View File

@@ -60,7 +60,6 @@ $(call gb_Helper_abbreviate_dirs,\
-c $(3) \
-o $(1) \
$(if $(COMPILER_TEST),,$(call gb_cxx_dep_generation_options,$(1),$(4))) \
-I$(dir $(3)) \
$(INCLUDE) \
$(PCHFLAGS) \
$(if $(COMPILER_TEST),,$(call gb_cxx_dep_copy,$(4))) \