diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-12 01:07:09 +0200 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-25 17:53:25 +0000 |
| commit | c29098917a1118d4b435df2b5f542adc8505e123 (patch) | |
| tree | f9407e3cf21b49abb40d536f73364abbddcb5ea3 /xmerge | |
| parent | e5ccda4bb32eef8cab99c4d43c1571ec4bad3980 (diff) | |
Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.
Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'xmerge')
| -rw-r--r-- | xmerge/Package_xmergesync.mk | 2 | ||||
| -rw-r--r-- | xmerge/source/activesync/makefile.mk | 4 | ||||
| -rw-r--r-- | xmerge/source/regutil/makefile.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xmerge/Package_xmergesync.mk b/xmerge/Package_xmergesync.mk index fbeead52090b..ef08b060a436 100644 --- a/xmerge/Package_xmergesync.mk +++ b/xmerge/Package_xmergesync.mk @@ -29,6 +29,6 @@ $(eval $(call gb_Package_Package,xmergesync,$(SRCDIR)/xmerge/source/activesync/BIN)) -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) $(eval $(call gb_Package_add_file,xmergesync,bin/xmergesync.dll,xmergesync.dll)) endif diff --git a/xmerge/source/activesync/makefile.mk b/xmerge/source/activesync/makefile.mk index 7e3b6d24ec04..45714ce3a4fa 100644 --- a/xmerge/source/activesync/makefile.mk +++ b/xmerge/source/activesync/makefile.mk @@ -29,7 +29,7 @@ SOLARINC+=-I$(POCKETPCSDK_HOME)$/support$/ActiveSync$/inc .INCLUDE: settings.mk .IF 0 -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" .IF "$(POCKETPCSDK_HOME)" != "" RCFILES=XMergeSync.rc @@ -57,6 +57,6 @@ SHL1STDLIBS= uuid.lib Advapi32.lib .INCLUDE : target.mk ALLTAR : - .IF "$(GUI)" == "WNT" + .IF "$(OS)" == "WNT" $(COPY) BIN$/xmergesync.dll $(BIN) .ENDIF diff --git a/xmerge/source/regutil/makefile.mk b/xmerge/source/regutil/makefile.mk index 12e0a65d9cb0..e520c2fb499d 100644 --- a/xmerge/source/regutil/makefile.mk +++ b/xmerge/source/regutil/makefile.mk @@ -25,7 +25,7 @@ LIBTARGET=NO # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" OBJFILES=$(OBJ)$/regutil.obj APP1TARGETDEPN=makefile.mk |