summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-02-25 19:21:10 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-16 12:58:53 +0200
commit437ebfc59020620acdd4ee81f6c980fa906ffa3a (patch)
tree2c561280856c48f2ce8651fd264b20b0141a2f3f /setup_native
parent451314f2947376e9717a30e2e2a06633f6afb3b0 (diff)
CWS gnumake4: remove annoying dependency of sfx2 on setup_native [hg:be9aeca025a2]
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/prj/build.lst2
-rw-r--r--setup_native/prj/d.lst2
-rw-r--r--setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx2
3 files changed, 2 insertions, 4 deletions
diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst
index 00d7a0c92045..df94edb61a00 100644
--- a/setup_native/prj/build.lst
+++ b/setup_native/prj/build.lst
@@ -1,4 +1,4 @@
-pk setup_native : L10N:l10n l10ntools soltools sal xml2cmp NULL
+pk setup_native : L10N:l10n l10ntools soltools sal sfx2 xml2cmp NULL
pk setup_native usr1 - all sn_mkout NULL
pk setup_native\scripts\source nmake - u sn_source NULL
pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 6aa6460d1823..3a5b80031930 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -59,5 +59,3 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
..\%__SRC%\lib\getuid.so %_DEST%\bin%_EXT%\getuid.so
-..\inc\setup_native\qswin32.h %_DEST%\inc%_EXT%\setup_native\qswin32.h
-
diff --git a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
index 6f931d2b0175..27c5210b3a27 100644
--- a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
@@ -26,7 +26,7 @@
************************************************************************/
#include "quickstarter.hxx"
-#include <setup_native/qswin32.h>
+#include <sfx2/qswin32.h>
static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam )
{