diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 15:38:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-02 16:34:53 +0200 |
| commit | fbed35762a6b14e8fda5179e320a9c30fd426454 (patch) | |
| tree | 2b5ad65f478667d501bc5876df52dc9e67e9ac39 /scp2 | |
| parent | 203c12c7ce5f54971755fb6fb2f04ec36e7797c4 (diff) | |
scp2: replace PACKAGE_FILELIST_DIR macro with SDK_PACKAGE_FILELIST
Change-Id: I3632c618e385d3f9963637c26d94b8395d5b8cb5
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rw-r--r-- | scp2/InstallModule_sdkoo.mk | 4 | ||||
| -rw-r--r-- | scp2/inc/macros.inc | 13 |
3 files changed, 9 insertions, 10 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index a4bd01cdafd0..e13d6367f501 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -43,7 +43,7 @@ $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE,,,PACKAGE_F $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE,PACKAGE_FILELIST)) -$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE,,PACKAGE_FILELIST)) +$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE,,SDK_PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE)) diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk index 7dfbcfaba49b..4c2881f35128 100644 --- a/scp2/InstallModule_sdkoo.mk +++ b/scp2/InstallModule_sdkoo.mk @@ -11,10 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/sdkoo)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/sdkoo,sdk)) -$(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\ - -DPACKAGE_FILELIST_DIR=FILELIST_SDK_DIR \ -)) - $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\ scp2/source/sdkoo/sdkoo \ )) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 8825fdc55d79..d55084c8bcdb 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -115,7 +115,14 @@ #define PACKAGE_FILELIST(id,name) \ File id \ - Dir = PACKAGE_FILELIST_DIR; \ + Dir = FILELIST_DIR; \ + Name = name; \ + Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \ +End + +#define SDK_PACKAGE_FILELIST(id,name) \ +File id \ + Dir = FILELIST_SDK_DIR; \ Name = name; \ Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \ End @@ -502,10 +509,6 @@ End #endif #endif -#if !defined PACKAGE_FILELIST_DIR -#define PACKAGE_FILELIST_DIR FILELIST_DIR -#endif - #define UI_FILELIST(name, file) \ File CONCAT2(gid_File_Share_Config_Sofficecfg_uiconfig_, name) \ TXT_FILE_BODY; \ |