[Libreoffice-commits] .: 2 commits - odk/examples odk/settings

[Tor Lillqvist]

 odk/examples/CLI/CSharp/Spreadsheet/Makefile |    2 +-
 odk/settings/stdtarget.mk                    |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit ff2c05d7b1411aeb67dc0ba415a1ec50db6331d6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 10 15:35:08 2011 +0300

    This makefile is for a standard Make, so use TABs

diff --git a/odk/settings/stdtarget.mk b/odk/settings/stdtarget.mk
index ba99722..938ab34 100644
--- a/odk/settings/stdtarget.mk
+++ b/odk/settings/stdtarget.mk
@@ -10,7 +10,8 @@ endif
 install: $(REGISTERFLAG)
 
 $(SDKTYPEFLAG):  #$(URE_TYPES) $(OFFICE_TYPES)
-    -$(MKDIR) $(subst /,$(PS),$(@D))
-    -$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
-    $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
-    echo flagged > $@
+# This is a makefile for a standard Make, so must be TABs below
+	-$(MKDIR) $(subst /,$(PS),$(@D))
+	-$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
+	$(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
+	echo flagged > $@
commit 5d578b73f96d95668493e9d51cde37b43e5fad8c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 10 15:34:37 2011 +0300

    There is no dk.mk in settings

diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
index bae593f..14785e8 100644
--- a/odk/examples/CLI/CSharp/Spreadsheet/Makefile
+++ b/odk/examples/CLI/CSharp/Spreadsheet/Makefile
@@ -5,7 +5,7 @@ SETTINGS = $(PRJ)/settings
 
 include $(SETTINGS)/settings.mk
 include $(SETTINGS)/std.mk
-include $(SETTINGS)/dk.mk
+#include $(SETTINGS)/dk.mk
 
 CSC_FLAGS = -warnaserror+ -noconfig
 VBC_FLAGS = -warnaserror+