Author: hdu
Date: Tue Nov 19 13:45:13 2013
New Revision: 1543429
URL: http://svn.apache.org/r1543429
Log:
#i107914# fix winaccessibility build when --disable-atl configure switch is used
Modified:
openoffice/trunk/main/winaccessibility/source/UAccCOM/makefile.mk
Modified: openoffice/trunk/main/winaccessibility/source/UAccCOM/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/winaccessibility/source/UAccCOM/makefile.mk?rev=1543429&r1=1543428&r2=1543429&view=diff
==============================================================================
--- openoffice/trunk/main/winaccessibility/source/UAccCOM/makefile.mk (original)
+++ openoffice/trunk/main/winaccessibility/source/UAccCOM/makefile.mk Tue Nov
19 13:45:13 2013
@@ -24,14 +24,14 @@ PRJNAME=winaccessibility
TARGET=UAccCOM
# --- Settings -----------------------------------------------------
-.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-PROF_EDITION=TRUE
-.ENDIF
+.IF "$(GUI)"!="WNT" || "$(DISABLE_ATL)"!=""
+all:
+ @echo "$TARGET will not be built because GUI='$(GUI)' and
DISABLE_ATL='$(DISABLE_ATL)'"
+.ELSE
+PROF_EDITION=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-
VERSIONOBJ=
LIBTARGET=NO
USE_DEFFILE=YES
@@ -121,8 +121,6 @@ SHL1RES=$(RES)/$(TARGET).res
DEF1NAME= $(TARGET)
#DEF1EXPORTFILE= exports.dxp
-.ENDIF
-
# --- Targets ----------------------------------
.INCLUDE : target.mk
@@ -133,3 +131,6 @@ $(MISC)/$(TARGET).manifest: $(BIN)$/$(TA
cat *.rgs > $(MISC)$/$(TARGET).rgs
mt.exe -rgs:$(MISC)$/$(TARGET).rgs -tlb:$(MISC)$/$(TARGET).tlb
-dll:$(TARGET).dll -out:$(MISC)$/$(TARGET).manifest
mt.exe -manifest $(MISC)$/$(TARGET).manifest
-outputresource:$(BIN)$/$(TARGET)$(DLLPOST)\;\#97
+
+.ENDIF # "$(GUI)"!="WNT" || "$(DISABLE_ATL)"!=""
+
