gnumake2: always compile debug files, wrap them in DBG_UTIL

6 files changed, 17 insertions, 7 deletions

diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk
index 7f9cfd297113..95509f0014d3 100644
--- a/sw/prj/target_lib_sw.mk
+++ b/sw/prj/target_lib_sw.mk
@@ -709,6 +709,10 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
     sw/source/ui/wrtsh/wrtsh3 \
     sw/source/ui/wrtsh/wrtsh4 \
     sw/source/ui/wrtsh/wrtundo \
+    sw/source/core/except/errhdl \
+    sw/source/core/except/dbgloop \
+    sw/source/core/layout/dbg_lay \
+    sw/source/core/text/txtio \
 ))
 
 ifeq ($(OS),LINUX)
diff --git a/sw/prj/target_lib_swd.mk b/sw/prj/target_lib_swd.mk
index 9d493c0bce98..1d185e8f4267 100644
--- a/sw/prj/target_lib_swd.mk
+++ b/sw/prj/target_lib_swd.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,swd,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,swd,\
+    sw/source/core/except/errhdl \
     sw/source/filter/basflt/iodetect \
     sw/source/ui/uno/detreg \
     sw/source/ui/uno/swdet2 \
diff --git a/sw/source/core/except/dbgloop.cxx b/sw/source/core/except/dbgloop.cxx
index e581758d5d84..c48c9e5d53bb 100644
--- a/sw/source/core/except/dbgloop.cxx
+++ b/sw/source/core/except/dbgloop.cxx
@@ -28,9 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-#ifndef DBG_UTIL
-#error Wer fummelt denn an den makefiles rum?
-#endif
+#ifdef DBG_UTIL
+
 #include <tools/stream.hxx>
 #include "dbgloop.hxx"
 #include "errhdl.hxx"
@@ -165,4 +164,5 @@ int main()
 }
 #endif
 
+#endif // DBG_UTIL
 
diff --git a/sw/source/core/except/errhdl.cxx b/sw/source/core/except/errhdl.cxx
index 6a36186eb439..b605523cf12e 100644
--- a/sw/source/core/except/errhdl.cxx
+++ b/sw/source/core/except/errhdl.cxx
@@ -27,6 +27,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
+#ifdef DBG_UTIL
+
 #define _ERRHDL_CXX
 
 
@@ -138,4 +141,5 @@ void AssertFail( USHORT nErrorId, const sal_Char* pFileName, USHORT nLine )
     AssertFail( pMsg, pFileName, nLine );
 }
 
+#endif // DBG_UTIL
 
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index ca2f9f748145..901050414774 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -28,6 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
+#ifdef DBG_UTIL
+
 /* -----------------08.01.99 14:55-------------------
  * Und hier die Beschreibung:
  *
@@ -863,4 +865,5 @@ void SwFrmChangesLeave::Leave()
         SwProtocol::Record( pFrm, PROT_FRMCHANGES, 0, &aFrm );
 }
 
+#endif // DBG_UTIL
 
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index b1996905935f..535c998b4cba 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -28,10 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
-#ifndef DBG_UTIL
-#error Wer fummelt denn an den makefiles?
-#endif
+#ifdef DBG_UTIL
 
 #include "viewsh.hxx"       // IsDbg()
 #include "viewopt.hxx"      // IsDbg()
@@ -946,4 +943,5 @@ SvStream &SwDropPortion::operator<<( SvStream &rOs ) const //$ ostream
 
 #endif /* OSL_DEBUG_LEVEL */
 
+#endif // DBG_UTIL