Fix for #15520: wxRichTextCtrl: Drawing the selection doesn't respect its container...

[wxWidgets.git] / src / expat / Makefile.in

diff --git a/src/expat/Makefile.in b/src/expat/Makefile.in
index 4c78a6cc129ec5f3fa105c3021db051efb3a7bac..9c0f5d49f0f4e3d4de52c265a80c952ef1f15009 100644 (file)
--- a/src/expat/Makefile.in
+++ b/src/expat/Makefile.in
@@ -30,7 +30,8 @@ exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
 includedir = @includedir@
 bindir = @bindir@
 libdir = @libdir@
 includedir = @includedir@

-mandir = ${prefix}/man/man1
+man1dir = @mandir@/man1
+pkgconfigdir = $(libdir)/pkgconfig

 
 top_builddir = .
 
 
 top_builddir = .
 


@@ -41,21 +42,23 @@ INSTALL_DATA = @INSTALL_DATA@
 mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
 
 MANFILE = $(srcdir)/doc/xmlwf.1
 mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
 
 MANFILE = $(srcdir)/doc/xmlwf.1

-APIHEADER = $(srcdir)/lib/expat.h
+APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h

 LIBRARY = libexpat.la
 
 LIBRARY = libexpat.la
 

+DESTDIR = $(INSTALL_ROOT)

 
 

-default:  buildlib xmlwf/xmlwf
+default:  buildlib xmlwf/xmlwf@EXEEXT@

 
 

-buildlib: $(LIBRARY)
+buildlib: $(LIBRARY) expat.pc

 
 

-all: $(LIBRARY) xmlwf/xmlwf examples/elements examples/outline
+all: $(LIBRARY) expat.pc xmlwf/xmlwf@EXEEXT@ examples/elements examples/outline

 
 clean:
 
 clean:

-       cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
-       cd xmlwf && rm -f xmlwf *.o *.lo && rm -rf .libs _libs
-       cd examples && rm -f elements outline *.o *.lo && rm -rf .libs _libs
-       cd tests && rm -rf .libs runtests runtests.o chardata.o
+       cd lib && rm -f $(LIBRARY) *.@OBJEXT@ *.lo && rm -rf .libs _libs
+       cd xmlwf && rm -f xmlwf *.@OBJEXT@ *.lo && rm -rf .libs _libs
+       cd examples && rm -f elements outline *.@OBJEXT@ *.lo && rm -rf .libs _libs
+       cd tests && rm -rf .libs runtests runtests.@OBJEXT@ runtestspp runtestspp.@OBJEXT@
+       cd tests && rm -f chardata.@OBJEXT@ minicheck.@OBJEXT@

        rm -rf .libs libexpat.la
        rm -f examples/core tests/core xmlwf/core
 
        rm -rf .libs libexpat.la
        rm -f examples/core tests/core xmlwf/core
 


@@ -63,32 +66,37 @@ clobber: clean
 
 distclean: clean
        rm -f expat_config.h config.status config.log config.cache libtool
 
 distclean: clean
        rm -f expat_config.h config.status config.log config.cache libtool

-       rm -f Makefile
+       rm -f Makefile expat.pc

 
 extraclean: distclean
        rm -f expat_config.h.in configure
 
 extraclean: distclean
        rm -f expat_config.h.in configure

-       rm -f conftools/ltconfig conftools/ltmain.sh conftools/libtool.m4
+       rm -f aclocal.m4 m4/*
+       rm -f conftools/ltmain.sh conftools/install-sh conftools/config.guess conftools/config.sub

 
 

-check: tests/runtests
+check: tests/runtests tests/runtestspp

        tests/runtests
        tests/runtests

+       tests/runtestspp

 
 

-install: xmlwf/xmlwf installlib
-       $(mkinstalldirs) $(bindir) $(mandir)
-       $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
-       $(INSTALL_DATA) $(MANFILE) $(mandir)
+install: xmlwf/xmlwf@EXEEXT@ installlib
+       $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+       $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf@EXEEXT@ $(DESTDIR)$(bindir)/xmlwf
+       $(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir)

 
 

-installlib: $(LIBRARY) $(APIHEADER)
-       $(mkinstalldirs) $(libdir) $(includedir)
-       $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
-       $(INSTALL_DATA) $(APIHEADER) $(includedir)
+installlib: $(LIBRARY) $(APIHEADER) expat.pc
+       $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(pkgconfigdir)
+       $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
+       for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(DESTDIR)$(includedir) ; done
+       $(INSTALL_DATA) expat.pc $(DESTDIR)$(pkgconfigdir)/expat.pc

 
 uninstall: uninstalllib
 
 uninstall: uninstalllib

-       $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
-       rm -f $(mandir)/xmlwf.1
+       $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf@EXEEXT@
+       rm -f $(DESTDIR)$(man1dir)/xmlwf.1

 
 uninstalllib:
 
 uninstalllib:

-       $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
-       rm -f $(includedir)/$(APIHEADER)
+       $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY)
+       rm -f $(DESTDIR)$(includedir)/expat.h
+       rm -f $(DESTDIR)$(includedir)/expat_external.h
+       rm -f $(DESTDIR)$(pkgconfigdir)/expat.pc

 
 # for VPATH builds (invoked by configure)
 mkdir-init:
 
 # for VPATH builds (invoked by configure)
 mkdir-init:


@@ -97,72 +105,92 @@ mkdir-init:
        done
 
 CC = @CC@
        done
 
 CC = @CC@

+CXX = @CXX@

 LIBTOOL = @LIBTOOL@
 
 INCLUDES = -I$(srcdir)/lib -I.
 LDFLAGS = @LDFLAGS@
 LIBTOOL = @LIBTOOL@
 
 INCLUDES = -I$(srcdir)/lib -I.
 LDFLAGS = @LDFLAGS@

-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ -DHAVE_EXPAT_CONFIG_H

 CFLAGS = @CFLAGS@
 CFLAGS = @CFLAGS@

+CXXFLAGS = @CXXFLAGS@

 VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
 
 ### autoconf this?
 LTFLAGS = --silent
 
 VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
 
 ### autoconf this?
 LTFLAGS = --silent
 

-COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES)
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
+CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) $(DEFS) $(CPPFLAGS)

 LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
 LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
 LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
 LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
 LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
 LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@

+LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE) $(LDFLAGS) -o $@

 
 LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
 $(LIBRARY): $(LIB_OBJS)
        $(LINK_LIB) $(LIB_OBJS)
 
 
 LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
 $(LIBRARY): $(LIB_OBJS)
        $(LINK_LIB) $(LIB_OBJS)
 

+expat.pc: $(top_builddir)/config.status
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+

 lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \
 lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \

-       $(top_builddir)/expat_config.h lib/internal.h
+       $(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h

 
 lib/xmlrole.lo: lib/xmlrole.c lib/ascii.h lib/xmlrole.h \
 
 lib/xmlrole.lo: lib/xmlrole.c lib/ascii.h lib/xmlrole.h \

-       $(top_builddir)/expat_config.h lib/internal.h
+       $(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h

 
 lib/xmltok.lo: lib/xmltok.c lib/xmltok_impl.c lib/xmltok_ns.c \
        lib/ascii.h lib/asciitab.h lib/iasciitab.h lib/latin1tab.h \
        lib/nametab.h lib/utf8tab.h lib/xmltok.h lib/xmltok_impl.h \
 
 lib/xmltok.lo: lib/xmltok.c lib/xmltok_impl.c lib/xmltok_ns.c \
        lib/ascii.h lib/asciitab.h lib/iasciitab.h lib/latin1tab.h \
        lib/nametab.h lib/utf8tab.h lib/xmltok.h lib/xmltok_impl.h \

-       $(top_builddir)/expat_config.h
+       $(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h

 
 
 
 

-XMLWF_OBJS = xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/@FILEMAP@.o
-xmlwf/xmlwf.o: xmlwf/xmlwf.c
-xmlwf/xmlfile.o: xmlwf/xmlfile.c
-xmlwf/codepage.o: xmlwf/codepage.c
-xmlwf/@FILEMAP@.o: xmlwf/@FILEMAP@.c
-xmlwf/xmlwf: $(XMLWF_OBJS) $(LIBRARY)
+XMLWF_OBJS = xmlwf/xmlwf.@OBJEXT@ xmlwf/xmlfile.@OBJEXT@ xmlwf/codepage.@OBJEXT@ xmlwf/@FILEMAP@.@OBJEXT@
+xmlwf/xmlwf.@OBJEXT@: xmlwf/xmlwf.c
+xmlwf/xmlfile.@OBJEXT@: xmlwf/xmlfile.c
+xmlwf/codepage.@OBJEXT@: xmlwf/codepage.c
+xmlwf/@FILEMAP@.@OBJEXT@: xmlwf/@FILEMAP@.c
+xmlwf/xmlwf@EXEEXT@: $(XMLWF_OBJS) $(LIBRARY)

        $(LINK_EXE) $(XMLWF_OBJS) $(LIBRARY)
 
        $(LINK_EXE) $(XMLWF_OBJS) $(LIBRARY)
 

-examples/elements.o: examples/elements.c
-examples/elements: examples/elements.o $(LIBRARY)
+examples/elements.@OBJEXT@: examples/elements.c
+examples/elements: examples/elements.@OBJEXT@ $(LIBRARY)

        $(LINK_EXE) $< $(LIBRARY)
 
        $(LINK_EXE) $< $(LIBRARY)
 

-examples/outline.o: examples/outline.c
-examples/outline: examples/outline.o $(LIBRARY)
+examples/outline.@OBJEXT@: examples/outline.c
+examples/outline: examples/outline.@OBJEXT@ $(LIBRARY)

        $(LINK_EXE) $< $(LIBRARY)
 
        $(LINK_EXE) $< $(LIBRARY)
 

-tests/chardata.o: tests/chardata.c tests/chardata.h
-tests/runtests.o: tests/runtests.c tests/chardata.h
-tests/runtests: tests/runtests.o tests/chardata.o $(LIBRARY)
-       $(LINK_EXE) $^ -lcheck
+tests/chardata.@OBJEXT@: tests/chardata.c tests/chardata.h
+tests/minicheck.@OBJEXT@: tests/minicheck.c tests/minicheck.h
+tests/runtests.@OBJEXT@: tests/runtests.c tests/chardata.h
+tests/runtests: tests/runtests.@OBJEXT@ tests/chardata.@OBJEXT@ tests/minicheck.@OBJEXT@ $(LIBRARY)
+       $(LINK_EXE) tests/runtests.@OBJEXT@ tests/chardata.@OBJEXT@ tests/minicheck.@OBJEXT@ $(LIBRARY)
+tests/runtestspp.@OBJEXT@: tests/runtestspp.cpp tests/runtests.c tests/chardata.h
+tests/runtestspp: tests/runtestspp.@OBJEXT@ tests/chardata.@OBJEXT@ tests/minicheck.@OBJEXT@ $(LIBRARY)
+       $(LINK_CXX_EXE) tests/runtestspp.@OBJEXT@ tests/chardata.@OBJEXT@ tests/minicheck.@OBJEXT@ $(LIBRARY)
+
+tests/benchmark/benchmark.@OBJEXT@: tests/benchmark/benchmark.c
+tests/benchmark/benchmark: tests/benchmark/benchmark.@OBJEXT@ $(LIBRARY)
+       $(LINK_EXE) tests/benchmark/benchmark.@OBJEXT@ $(LIBRARY)
+
+run-benchmark: tests/benchmark/benchmark
+       tests/benchmark/benchmark@EXEEXT@ -n $(top_srcdir)/../testdata/largefiles/recset.xml 65535 3

 
 tests/xmlts.zip:
        wget --output-document=tests/xmlts.zip \
 
 tests/xmlts.zip:
        wget --output-document=tests/xmlts.zip \

-               http://www.w3.org/XML/Test/xmlts20020606.zip
+               http://www.w3.org/XML/Test/xmlts20080827.zip

 
 tests/XML-Test-Suite: tests/xmlts.zip
        cd tests && unzip -q xmlts.zip
 
 
 tests/XML-Test-Suite: tests/xmlts.zip
        cd tests && unzip -q xmlts.zip
 

-run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite
+run-xmltest: xmlwf/xmlwf@EXEEXT@ tests/XML-Test-Suite

        tests/xmltest.sh
 
        tests/xmltest.sh
 

-.SUFFIXES: .c .lo .o
+.SUFFIXES: .c .cpp .lo .@OBJEXT@

 
 

-.c.o:
+.cpp.@OBJEXT@:
+       $(CXXCOMPILE) -o $@ -c $<
+.c.@OBJEXT@:

        $(COMPILE) -o $@ -c $<
 .c.lo:
        $(LTCOMPILE) -o $@ -c $<
        $(COMPILE) -o $@ -c $<
 .c.lo:
        $(LTCOMPILE) -o $@ -c $<