This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 3c1322392c0f0de644bc78d910dc47c80f4e0163 Author: Don Lewis <[email protected]> AuthorDate: Sun Jun 1 18:15:56 2025 -0700 Re-order include path - Part 2 Patch nmake modules in AOO41X that were converted to gbuild in AOO42X. --- main/canvas/source/cairo/makefile.mk | 4 ++-- main/connectivity/source/drivers/kab/makefile.mk | 2 +- main/fpicker/source/unx/gnome/makefile.mk | 2 +- main/fpicker/source/unx/kde4/makefile.mk | 2 +- main/jvmfwk/source/makefile.mk | 3 ++- main/l10ntools/source/help/makefile.mk | 2 +- main/oox/source/core/makefile.mk | 2 +- main/sccomp/source/solver/makefile.mk | 3 ++- main/ucb/source/ucp/webdav/makefile.mk | 10 +++++----- main/xmlhelp/source/cxxhelp/provider/makefile.mk | 4 ++-- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/main/canvas/source/cairo/makefile.mk b/main/canvas/source/cairo/makefile.mk index 2421aaba6f..c040d2f8ad 100644 --- a/main/canvas/source/cairo/makefile.mk +++ b/main/canvas/source/cairo/makefile.mk @@ -49,7 +49,7 @@ DLLPRE = .IF "$(SYSTEM_CAIRO)" == "YES" -CFLAGS+=$(CAIRO_CFLAGS) +INCSYSTEM+=$(CAIRO_CFLAGS) .ELSE CFLAGS+=-I$(SOLARINCDIR)/cairo .ENDIF @@ -95,7 +95,7 @@ CFLAGSCXX+=$(OBJCXXFLAGS) # Xlib SLOFILES+= $(SLO)$/cairo_xlib_cairo.obj SHL1STDLIBS+= -lfontconfig -lX11 -lXrender $(FREETYPE_LIBS) -CFLAGS+=$(FREETYPE_CFLAGS) +INCSYSTEM+=$(FREETYPE_CFLAGS) .ENDIF # "$(GUIBASE)"=="aqua" diff --git a/main/connectivity/source/drivers/kab/makefile.mk b/main/connectivity/source/drivers/kab/makefile.mk index e3f1927b59..1fa7dfad51 100644 --- a/main/connectivity/source/drivers/kab/makefile.mk +++ b/main/connectivity/source/drivers/kab/makefile.mk @@ -38,7 +38,7 @@ VISIBILITY_HIDDEN=TRUE .IF "$(GUI)" == "UNX" .IF "$(ENABLE_KAB)" == "TRUE" -CFLAGS+=$(KDE_CFLAGS) +INCSYSTEM+=$(KDE_CFLAGS) .IF "$(KDE_ROOT)"!="" EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib diff --git a/main/fpicker/source/unx/gnome/makefile.mk b/main/fpicker/source/unx/gnome/makefile.mk index 4f4f3412b7..25cbde0683 100644 --- a/main/fpicker/source/unx/gnome/makefile.mk +++ b/main/fpicker/source/unx/gnome/makefile.mk @@ -56,7 +56,7 @@ dummy: .ELSE CFLAGS+= $(WIDGETSET_CFLAGS) -CFLAGS+= $(PKGCONFIG_CFLAGS) +INCSYSTEM+= $(PKGCONFIG_CFLAGS) # --- Files -------------------------------------------------------- diff --git a/main/fpicker/source/unx/kde4/makefile.mk b/main/fpicker/source/unx/kde4/makefile.mk index 7cb657e7dc..04ee55e842 100644 --- a/main/fpicker/source/unx/kde4/makefile.mk +++ b/main/fpicker/source/unx/kde4/makefile.mk @@ -43,7 +43,7 @@ dummy: .ELSE # we build for KDE -CFLAGS+= $(KDE4_CFLAGS) +INCSYSTEM+= $(KDE4_CFLAGS) # --- Files -------------------------------------------------------- diff --git a/main/jvmfwk/source/makefile.mk b/main/jvmfwk/source/makefile.mk index 86309c94ad..d93f3be98e 100644 --- a/main/jvmfwk/source/makefile.mk +++ b/main/jvmfwk/source/makefile.mk @@ -34,7 +34,8 @@ UNIXVERSIONNAMES = UDK .INCLUDE: settings.mk .IF "$(SYSTEM_LIBXML)" == "YES" -CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) +INCSYSTEM+=$(LIBXML_CFLAGS) +CFLAGS+=-DSYSTEM_LIBXML .ENDIF UNOUCROUT = $(OUT)$/inc diff --git a/main/l10ntools/source/help/makefile.mk b/main/l10ntools/source/help/makefile.mk index b2f91857e4..c875bdb509 100644 --- a/main/l10ntools/source/help/makefile.mk +++ b/main/l10ntools/source/help/makefile.mk @@ -34,7 +34,7 @@ TARGETTYPE=CUI .INCLUDE : helplinker.pmk .IF "$(SYSTEM_LIBXSLT)" == "YES" -CFLAGS+= $(LIBXSLT_CFLAGS) +INCSYSTEM+= $(LIBXSLT_CFLAGS) .ELSE LIBXSLTINCDIR=external$/libxslt CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR) diff --git a/main/oox/source/core/makefile.mk b/main/oox/source/core/makefile.mk index df083e78e4..a22751b5cc 100644 --- a/main/oox/source/core/makefile.mk +++ b/main/oox/source/core/makefile.mk @@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE: $(PRJ)$/util$/makefile.pmk .IF "$(SYSTEM_OPENSSL)" == "YES" -CFLAGS+= $(OPENSSL_CFLAGS) +INCSYSTEM+= $(OPENSSL_CFLAGS) .ENDIF # --- Files -------------------------------------------------------- diff --git a/main/sccomp/source/solver/makefile.mk b/main/sccomp/source/solver/makefile.mk index 69417c2335..34fc95c0e8 100644 --- a/main/sccomp/source/solver/makefile.mk +++ b/main/sccomp/source/solver/makefile.mk @@ -66,7 +66,8 @@ SHL1VERSIONMAP= $(SOLARENV)/src/component.map DEF1NAME= $(SHL1TARGET) .IF "$(SYSTEM_COINMP)" == "YES" -CFLAGS+= $(COINMP_CFLAGS) -DSYSTEM_COINMP +INCSYSTEM+= $(COINMP_CFLAGS) +CFLAGS+= -DSYSTEM_COINMP # Use the library flags from configure SHL1STDLIBS+=$(COINMP_LIBS) .ELSE diff --git a/main/ucb/source/ucp/webdav/makefile.mk b/main/ucb/source/ucp/webdav/makefile.mk index 77e3896332..3b3f68ccc5 100644 --- a/main/ucb/source/ucp/webdav/makefile.mk +++ b/main/ucb/source/ucp/webdav/makefile.mk @@ -56,7 +56,7 @@ SERFINCDIR=serf # .IF "$(SYSTEM_APR)" == "YES" -CFLAGS+= $(APR_CFLAGS) +INCSYSTEM+= $(APR_CFLAGS) SHL1STDLIBS+=$(APR_LIBS) .ELSE CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR) @@ -67,7 +67,7 @@ CFLAGS+=\ .ENDIF .IF "$(SYSTEM_APR_UTIL)" == "YES" -CFLAGS+= $(APR_UTIL_CFLAGS) +INCSYSTEM+= $(APR_UTIL_CFLAGS) SHL1STDLIBS+=$(APR_UTIL_LIBS) .ELSE CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR) @@ -78,7 +78,7 @@ CFLAGS+=\ .ENDIF .IF "$(SYSTEM_SERF)" == "YES" -CFLAGS+= $(SERF_CFLAGS) +INCSYSTEM+= $(SERF_CFLAGS) SHL1STDLIBS+=$(SERF_LIBS) .ELSE CFLAGS+= -I$(SOLARINCDIR)$/$(SERFINCDIR) @@ -89,14 +89,14 @@ CFLAGS+=\ .ENDIF .IF "$(SYSTEM_LIBXML)" == "YES" -CFLAGS+= $(LIBXML_CFLAGS) +INCSYSTEM+= $(LIBXML_CFLAGS) .ELSE LIBXMLINCDIR=external$/libxml CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR) .ENDIF .IF "$(SYSTEM_OPENSSL)" == "YES" -CFLAGS+= -I$(OPENSSL_CFLAGS) +INCSYSTEM+= -I$(OPENSSL_CFLAGS) SHL1STDLIBS+= $(OPENSSLLIB) .ELSE SHL1STDLIBS+= $(OPENSSLLIBST) diff --git a/main/xmlhelp/source/cxxhelp/provider/makefile.mk b/main/xmlhelp/source/cxxhelp/provider/makefile.mk index 72f237f7ac..4a367904cc 100644 --- a/main/xmlhelp/source/cxxhelp/provider/makefile.mk +++ b/main/xmlhelp/source/cxxhelp/provider/makefile.mk @@ -49,14 +49,14 @@ CFLAGSWERRCXX:= CFLAGS += -DHAVE_EXPAT_H .IF "$(SYSTEM_LIBXML)" == "YES" -CFLAGS+= $(LIBXML_CFLAGS) +INCSYSTEM+= $(LIBXML_CFLAGS) .ELSE LIBXMLINCDIR=external$/libxml CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR) .ENDIF .IF "$(SYSTEM_LIBXSLT)" == "YES" -CFLAGS+= $(LIBXSLT_CFLAGS) +INCSYSTEM+= $(LIBXSLT_CFLAGS) .ELSE LIBXSLTINCDIR=external$/libxslt CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
