odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile | 2 +-
odk/examples/cpp/complextoolbarcontrols/Makefile | 2 +-
odk/examples/cpp/custompanel/Makefile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6c08211a2a37c6b1841a78d5a99d720ec385cb6b
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Feb 17 13:41:54 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Feb 17 14:29:42 2023 +0000
Remove remaining STL_INCLUDES
...that 1628005298923ad15cc78dbad63669b701f5fd04 "Trying to remove the
stlport
mention from the code" didn't catch
Change-Id: I271d7760d2b2dd25c0fa27489a8ddf455963d970
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147213
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
index 567ba11490d2..06afac5fbf5d 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
@@ -75,7 +75,7 @@ include $(SETTINGS)/stdtarget.mk
$(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(CC) $(CC_FLAGS) $(CC_INCLUDES) $(STL_INCLUDES) -I$(OUT_COMP_INC)
$(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
+ $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES)
$(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
ifeq "$(OS)" "WIN"
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile
b/odk/examples/cpp/complextoolbarcontrols/Makefile
index ad75987cfab0..0defc6176479 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -76,7 +76,7 @@ include $(SETTINGS)/stdtarget.mk
$(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(CC) $(CC_FLAGS) $(STL_INCLUDES) $(CC_INCLUDES) -I$(OUT_COMP_INC)
$(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
+ $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES)
$(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
ifeq "$(OS)" "WIN"
diff --git a/odk/examples/cpp/custompanel/Makefile
b/odk/examples/cpp/custompanel/Makefile
index fcbcd20dcedf..b19c5a1721b6 100644
--- a/odk/examples/cpp/custompanel/Makefile
+++ b/odk/examples/cpp/custompanel/Makefile
@@ -71,7 +71,7 @@ include $(SETTINGS)/stdtarget.mk
$(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(CC) $(CC_FLAGS) $(STL_INCLUDES) $(CC_INCLUDES) -I$(OUT_COMP_INC)
$(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
+ $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES)
$(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
#$(COMP_MAPFILE) : $(SLOFILES)
