summaryrefslogtreecommitdiff
path: root/chromium/third_party/libxml/src/win32/Makefile.mingw
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/libxml/src/win32/Makefile.mingw')
-rw-r--r--chromium/third_party/libxml/src/win32/Makefile.mingw22
1 files changed, 3 insertions, 19 deletions
diff --git a/chromium/third_party/libxml/src/win32/Makefile.mingw b/chromium/third_party/libxml/src/win32/Makefile.mingw
index 9dfa4abec69..bd0c4297d3f 100644
--- a/chromium/third_party/libxml/src/win32/Makefile.mingw
+++ b/chromium/third_party/libxml/src/win32/Makefile.mingw
@@ -40,19 +40,16 @@ endif
# The compiler and its options.
CC = gcc.exe
-CFLAGS += -DWIN32 -D_WINDOWS -D_MBCS -DNOLIBTOOL
+CFLAGS += -D_WINDOWS -D_MBCS -DNOLIBTOOL
CFLAGS += -I$(XML_SRCDIR) -I$(XML_SRCDIR)/include -I$(INCPREFIX) $(INCLUDE)
ifneq ($(WITH_THREADS),no)
CFLAGS += -D_REENTRANT
endif
ifeq ($(WITH_THREADS),yes)
-CFLAGS += -DHAVE_WIN32_THREADS -DHAVE_COMPILER_TLS
+CFLAGS += -DHAVE_COMPILER_TLS
endif
ifeq ($(WITH_THREADS),ctls)
-CFLAGS += -DHAVE_WIN32_THREADS -DHAVE_COMPILER_TLS
-endif
-ifeq ($(WITH_THREADS),native)
-CFLAGS += -DHAVE_WIN32_THREADS
+CFLAGS += -DHAVE_COMPILER_TLS
endif
ifeq ($(WITH_THREADS),posix)
CFLAGS += -DHAVE_PTHREAD_H
@@ -111,7 +108,6 @@ XML_OBJS = $(XML_INTDIR)/buf.o\
$(XML_INTDIR)/chvalid.o\
$(XML_INTDIR)/debugXML.o\
$(XML_INTDIR)/dict.o\
- $(XML_INTDIR)/DOCBparser.o\
$(XML_INTDIR)/encoding.o\
$(XML_INTDIR)/entities.o\
$(XML_INTDIR)/error.o\
@@ -159,7 +155,6 @@ XML_OBJS_A = $(XML_INTDIR_A)/buf.o\
$(XML_INTDIR_A)/chvalid.o\
$(XML_INTDIR_A)/debugXML.o\
$(XML_INTDIR_A)/dict.o\
- $(XML_INTDIR_A)/DOCBparser.o\
$(XML_INTDIR_A)/encoding.o\
$(XML_INTDIR_A)/entities.o\
$(XML_INTDIR_A)/error.o\
@@ -203,18 +198,7 @@ XML_SRCS_A = $(subst .o,.c,$(subst $(XML_INTDIR_A)/,$(XML_SRCDIR)/,$(XML_OBJS_A)
# Xmllint and friends executables.
UTILS = $(BINDIR)/xmllint.exe\
$(BINDIR)/xmlcatalog.exe\
- $(BINDIR)/testAutomata.exe\
- $(BINDIR)/testC14N.exe\
- $(BINDIR)/testDocbook.exe\
- $(BINDIR)/testHTML.exe\
- $(BINDIR)/testReader.exe\
- $(BINDIR)/testRegexp.exe\
$(BINDIR)/testModule.exe\
- $(BINDIR)/testRelax.exe\
- $(BINDIR)/testSAX.exe\
- $(BINDIR)/testSchemas.exe\
- $(BINDIR)/testURI.exe\
- $(BINDIR)/testXPath.exe\
$(BINDIR)/runtest.exe\
$(BINDIR)/runsuite.exe\
$(BINDIR)/testapi.exe\