diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-03-12 16:24:34 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-03-12 18:30:33 +0100 |
| commit | fece68732916d24c265552ee432d21d3a2d5f8ce (patch) | |
| tree | 5c817f4378a063c523ca038d6bf069ab83861378 /desktop | |
| parent | c7458a4a71a1e875e03772b0f6e8ad9e1a982006 (diff) | |
desktop: move lockfile.cxx to libdeploymentmisc
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Library_deploymentmisc.mk | 1 | ||||
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 2 | ||||
| -rw-r--r-- | desktop/Library_unopkgapp.mk | 1 | ||||
| -rw-r--r-- | desktop/source/deployment/inc/lockfile.hxx (renamed from desktop/source/app/lockfile.hxx) | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/lockfile.cxx (renamed from desktop/source/app/lockfile.cxx) | 0 | ||||
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 2 |
6 files changed, 6 insertions, 4 deletions
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index abcc0e29e9c2..33965b3bb478 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -77,6 +77,7 @@ $(eval $(call gb_Library_add_exception_objects,deploymentmisc,\ desktop/source/deployment/misc/dp_ucb \ desktop/source/deployment/misc/dp_update \ desktop/source/deployment/misc/dp_version \ + desktop/source/deployment/misc/lockfile \ )) # vim: set ts=4 sw=4 et: diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index cf38cb9e4165..668f290f127c 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_set_include,sofficeapp,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc \ -I$(SRCDIR)/desktop/source/inc \ + -I$(SRCDIR)/desktop/source/deployment/inc \ )) $(eval $(call gb_Library_add_api,sofficeapp,\ @@ -83,7 +84,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/app/desktopresid \ desktop/source/app/dispatchwatcher \ desktop/source/app/langselect \ - desktop/source/app/lockfile \ desktop/source/app/lockfile2 \ desktop/source/app/officeipcthread \ desktop/source/app/sofficemain \ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index d2f9abbb4491..04a08bd6074b 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,unopkgapp,\ )) $(eval $(call gb_Library_add_exception_objects,unopkgapp,\ - desktop/source/app/lockfile \ desktop/source/pkgchk/unopkg/unopkg_app \ desktop/source/pkgchk/unopkg/unopkg_cmdenv \ desktop/source/pkgchk/unopkg/unopkg_misc \ diff --git a/desktop/source/app/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx index 35deb80d9e85..79b88960d623 100644 --- a/desktop/source/app/lockfile.hxx +++ b/desktop/source/deployment/inc/lockfile.hxx @@ -45,6 +45,8 @@ #include "rtl/string.hxx" #include "rtl/ustring.hxx" +#include "dp_misc_api.hxx" + #define LOCKFILE_SUFFIX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/.lock" ) ) #define LOCKFILE_GROUP rtl::OString(RTL_CONSTASCII_STRINGPARAM( "Lockdata" ) ) #define LOCKFILE_USERKEY rtl::OString(RTL_CONSTASCII_STRINGPARAM( "User" ) ) @@ -58,7 +60,7 @@ namespace desktop { class Lockfile; bool Lockfile_execWarning( Lockfile * that ); - class Lockfile + class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Lockfile { public: diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx index fd9291fecc72..fd9291fecc72 100644 --- a/desktop/source/app/lockfile.cxx +++ b/desktop/source/deployment/misc/lockfile.cxx diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 0750d38d4d0e..c7b5e67aa155 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -31,7 +31,7 @@ #include "unopkg_shared.h" #include "dp_identifier.hxx" #include "../../deployment/gui/dp_gui.hrc" -#include "../../app/lockfile.hxx" +#include "lockfile.hxx" #include "vcl/svapp.hxx" #include "vcl/msgbox.hxx" #include "rtl/bootstrap.hxx" |