diff options
-rw-r--r-- | RepositoryExternal.mk | 6 | ||||
-rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
-rw-r--r-- | external/Module_external.mk | 1 | ||||
-rw-r--r-- | external/np_sdk/Makefile (renamed from np_sdk/Makefile) | 2 | ||||
-rw-r--r-- | external/np_sdk/Module_np_sdk.mk (renamed from np_sdk/Module_np_sdk.mk) | 0 | ||||
-rw-r--r-- | external/np_sdk/README (renamed from np_sdk/README) | 0 | ||||
-rw-r--r-- | external/np_sdk/StaticLibrary_nputils.mk (renamed from np_sdk/StaticLibrary_nputils.mk) | 4 | ||||
-rw-r--r-- | external/np_sdk/inc/LEGAL (renamed from np_sdk/inc/LEGAL) | 0 | ||||
-rw-r--r-- | external/np_sdk/inc/LICENSE (renamed from np_sdk/inc/LICENSE) | 0 | ||||
-rw-r--r-- | external/np_sdk/inc/npapi.h (renamed from np_sdk/inc/npapi.h) | 0 | ||||
-rw-r--r-- | external/np_sdk/inc/npfunctions.h (renamed from np_sdk/inc/npfunctions.h) | 0 | ||||
-rw-r--r-- | external/np_sdk/inc/npruntime.h (renamed from np_sdk/inc/npruntime.h) | 0 | ||||
-rw-r--r-- | external/np_sdk/inc/nptypes.h (renamed from np_sdk/inc/nptypes.h) | 0 | ||||
-rw-r--r-- | external/np_sdk/npsdk/LEGAL (renamed from np_sdk/npsdk/LEGAL) | 0 | ||||
-rw-r--r-- | external/np_sdk/npsdk/LICENSE (renamed from np_sdk/npsdk/LICENSE) | 0 | ||||
-rw-r--r-- | external/np_sdk/npsdk/README (renamed from np_sdk/npsdk/README) | 0 | ||||
-rw-r--r-- | external/np_sdk/npsdk/jri.h (renamed from np_sdk/npsdk/jri.h) | 0 | ||||
-rw-r--r-- | external/np_sdk/npsdk/jri_md.h (renamed from np_sdk/npsdk/jri_md.h) | 0 | ||||
-rw-r--r-- | external/np_sdk/npsdk/jritypes.h (renamed from np_sdk/npsdk/jritypes.h) | 0 | ||||
-rw-r--r-- | external/np_sdk/npsdk/npunix.c (renamed from np_sdk/npsdk/npunix.c) | 0 | ||||
-rw-r--r-- | external/np_sdk/npsdk/npupp.h (renamed from np_sdk/npsdk/npupp.h) | 0 | ||||
-rw-r--r-- | external/np_sdk/npsdk/npwin.cxx (renamed from np_sdk/npsdk/npwin.cxx) | 0 | ||||
-rw-r--r-- | external/np_sdk/npsdk/plugin.h (renamed from np_sdk/npsdk/plugin.h) | 2 |
23 files changed, 8 insertions, 8 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 08afde3b50b1..6fa5c82f108e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -84,7 +84,7 @@ ifeq ($(SYSTEM_NPAPI_HEADERS),YES) define gb_LinkTarget__use_npapi_headers $(call gb_LinkTarget_set_include,$(1),\ $(NPAPI_HEADERS_CFLAGS) \ - -I$(SRCDIR)/np_sdk \ + -I$(SRCDIR)/external/np_sdk \ $$(INCLUDE) \ ) @@ -94,8 +94,8 @@ else #!SYSTEM_NPAPI_HEADERS define gb_LinkTarget__use_npapi_headers $(call gb_LinkTarget_set_include,$(1),\ - -I$(SRCDIR)/np_sdk/inc \ - -I$(SRCDIR)/np_sdk \ + -I$(SRCDIR)/external/np_sdk/inc \ + -I$(SRCDIR)/external/np_sdk \ $$(INCLUDE) \ ) diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 85223e09c9fd..fb7268d24bb5 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,DESKTOP,l10ntools) \ $(call gb_Helper_optional,MARIADBC,mysqlc) \ $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ - np_sdk \ o3tl \ $(call gb_Helper_optional,ODK,odk) \ offapi \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 4633be319c54..f0fae3eca5e5 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals)) endif $(eval $(call gb_Module_add_moduledirs,external,\ + np_sdk \ $(call gb_Helper_optional,AFMS,afms) \ $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ $(call gb_Helper_optional,BOOST,boost) \ diff --git a/np_sdk/Makefile b/external/np_sdk/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/np_sdk/Makefile +++ b/external/np_sdk/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/np_sdk/Module_np_sdk.mk b/external/np_sdk/Module_np_sdk.mk index 58b7404a8837..58b7404a8837 100644 --- a/np_sdk/Module_np_sdk.mk +++ b/external/np_sdk/Module_np_sdk.mk diff --git a/np_sdk/README b/external/np_sdk/README index da63135a8f86..da63135a8f86 100644 --- a/np_sdk/README +++ b/external/np_sdk/README diff --git a/np_sdk/StaticLibrary_nputils.mk b/external/np_sdk/StaticLibrary_nputils.mk index 3ff331475e2b..bbbd66db32e0 100644 --- a/np_sdk/StaticLibrary_nputils.mk +++ b/external/np_sdk/StaticLibrary_nputils.mk @@ -22,11 +22,11 @@ endif ifeq ($(OS),WNT) $(eval $(call gb_StaticLibrary_add_exception_objects,nputils,\ - np_sdk/npsdk/npwin \ + external/np_sdk/npsdk/npwin \ )) else $(eval $(call gb_StaticLibrary_add_cobjects,nputils,\ - np_sdk/npsdk/npunix \ + external/np_sdk/npsdk/npunix \ )) endif diff --git a/np_sdk/inc/LEGAL b/external/np_sdk/inc/LEGAL index c10e0f0d21a8..c10e0f0d21a8 100644 --- a/np_sdk/inc/LEGAL +++ b/external/np_sdk/inc/LEGAL diff --git a/np_sdk/inc/LICENSE b/external/np_sdk/inc/LICENSE index 18f8109b7972..18f8109b7972 100644 --- a/np_sdk/inc/LICENSE +++ b/external/np_sdk/inc/LICENSE diff --git a/np_sdk/inc/npapi.h b/external/np_sdk/inc/npapi.h index e554d2a985a4..e554d2a985a4 100644 --- a/np_sdk/inc/npapi.h +++ b/external/np_sdk/inc/npapi.h diff --git a/np_sdk/inc/npfunctions.h b/external/np_sdk/inc/npfunctions.h index 9754567e67f5..9754567e67f5 100644 --- a/np_sdk/inc/npfunctions.h +++ b/external/np_sdk/inc/npfunctions.h diff --git a/np_sdk/inc/npruntime.h b/external/np_sdk/inc/npruntime.h index 816a4f863965..816a4f863965 100644 --- a/np_sdk/inc/npruntime.h +++ b/external/np_sdk/inc/npruntime.h diff --git a/np_sdk/inc/nptypes.h b/external/np_sdk/inc/nptypes.h index 63dcb0602b3b..63dcb0602b3b 100644 --- a/np_sdk/inc/nptypes.h +++ b/external/np_sdk/inc/nptypes.h diff --git a/np_sdk/npsdk/LEGAL b/external/np_sdk/npsdk/LEGAL index c10e0f0d21a8..c10e0f0d21a8 100644 --- a/np_sdk/npsdk/LEGAL +++ b/external/np_sdk/npsdk/LEGAL diff --git a/np_sdk/npsdk/LICENSE b/external/np_sdk/npsdk/LICENSE index 18f8109b7972..18f8109b7972 100644 --- a/np_sdk/npsdk/LICENSE +++ b/external/np_sdk/npsdk/LICENSE diff --git a/np_sdk/npsdk/README b/external/np_sdk/npsdk/README index 9c05653ef6eb..9c05653ef6eb 100644 --- a/np_sdk/npsdk/README +++ b/external/np_sdk/npsdk/README diff --git a/np_sdk/npsdk/jri.h b/external/np_sdk/npsdk/jri.h index 04e237f2d144..04e237f2d144 100644 --- a/np_sdk/npsdk/jri.h +++ b/external/np_sdk/npsdk/jri.h diff --git a/np_sdk/npsdk/jri_md.h b/external/np_sdk/npsdk/jri_md.h index ab631d1904a7..ab631d1904a7 100644 --- a/np_sdk/npsdk/jri_md.h +++ b/external/np_sdk/npsdk/jri_md.h diff --git a/np_sdk/npsdk/jritypes.h b/external/np_sdk/npsdk/jritypes.h index 03a7a9dcfe41..03a7a9dcfe41 100644 --- a/np_sdk/npsdk/jritypes.h +++ b/external/np_sdk/npsdk/jritypes.h diff --git a/np_sdk/npsdk/npunix.c b/external/np_sdk/npsdk/npunix.c index e6b9702e3d84..e6b9702e3d84 100644 --- a/np_sdk/npsdk/npunix.c +++ b/external/np_sdk/npsdk/npunix.c diff --git a/np_sdk/npsdk/npupp.h b/external/np_sdk/npsdk/npupp.h index e0812ecd9408..e0812ecd9408 100644 --- a/np_sdk/npsdk/npupp.h +++ b/external/np_sdk/npsdk/npupp.h diff --git a/np_sdk/npsdk/npwin.cxx b/external/np_sdk/npsdk/npwin.cxx index 9021c635993c..9021c635993c 100644 --- a/np_sdk/npsdk/npwin.cxx +++ b/external/np_sdk/npsdk/npwin.cxx diff --git a/np_sdk/npsdk/plugin.h b/external/np_sdk/npsdk/plugin.h index ec0dc040538c..6f7913b5f6a5 100644 --- a/np_sdk/npsdk/plugin.h +++ b/external/np_sdk/npsdk/plugin.h @@ -23,7 +23,7 @@ #include "npapi.h" /* OpenOffice.org/LibreOffice modified the implementations of NP_Initialize and - NP_Shutdown in np_sdk/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp., + NP_Shutdown in external/np_sdk/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp., defined in extensions/source/nsplugin/source/npshell.cxx: */ |