diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:36 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:36 +0100 |
commit | 11cdc4ccc4ae58437ded5aef40df1276220edc2c (patch) | |
tree | 7e367cf5e21e93532d69126eadac3090e1d33a1a /odk/examples/CLI/CSharp/Spreadsheet/Makefile | |
parent | f03de39457c663e88592899ebda0f07c4e24aa9c (diff) | |
parent | 33e2b11638c87ffed5d91405ba76cb00cd91e1be (diff) |
Merge commit 'ooo/DEV300_m103'
Conflicts:
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
odk/examples/cpp/complextoolbarcontrols/exports.cxx
odk/examples/cpp/counter/countermain.cxx
odk/examples/cpp/remoteclient/remoteclient.cxx
odk/settings/settings.mk
Diffstat (limited to 'odk/examples/CLI/CSharp/Spreadsheet/Makefile')
-rw-r--r-- | odk/examples/CLI/CSharp/Spreadsheet/Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile index cbe43167905d..bae593f34069 100644 --- a/odk/examples/CLI/CSharp/Spreadsheet/Makefile +++ b/odk/examples/CLI/CSharp/Spreadsheet/Makefile @@ -25,10 +25,7 @@ CLI_LIB_LOCATION = $(PRJ)\cli # Targets .PHONY : ALL -ALL : SpreadsheetSample \ - GeneralTableSample \ - ViewSample \ - Info +ALL : Info include $(SETTINGS)/stdtarget.mk @@ -56,7 +53,8 @@ GeneralTableSample : $(SPREADSHEET_OUT)/GeneralTableSample.exe ViewSample : $(SPREADSHEET_OUT)/ViewSample.exe .PHONY : Info -Info : +ifeq "$(OS)" "WIN" +Info : SpreadsheetSample GenerateTableSample ViewSample @echo ------------------------------------------------------------------------------- @echo Please use one of the following commands to execute the examples! @echo - @@ -64,7 +62,12 @@ Info : @echo $(MAKE) SpreadsheetSample.run @echo $(MAKE) ViewSample.run @echo ------------------------------------------------------------------------------- - +else +Info : + @echo -------------------------------------------------------------------------------- + @echo This example works only under Windows! + @echo -------------------------------------------------------------------------------- +endif %.run : $(SPREADSHEET_OUT)/%.exe @echo ------------------------------------------------------------------------------- |