Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/expat/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/b8aa99b42c64
branches: trunk
changeset: 824778:b8aa99b42c64
user: christos <christos%NetBSD.org@localhost>
date: Sat Jun 17 22:05:19 2017 +0000
description:
merge conflicts
diffstat:
external/mit/expat/dist/amiga/Makefile | 336 -----
external/mit/expat/dist/amiga/README.txt | 98 -
external/mit/expat/dist/amiga/expat.xml | 264 ----
external/mit/expat/dist/amiga/expat_68k.c | 939 ---------------
external/mit/expat/dist/amiga/expat_68k.h | 94 -
external/mit/expat/dist/amiga/expat_68k_handler_stubs.c | 185 --
external/mit/expat/dist/amiga/expat_base.h | 40 -
external/mit/expat/dist/amiga/expat_lib.c | 247 ---
external/mit/expat/dist/amiga/expat_vectors.c | 505 --------
external/mit/expat/dist/amiga/include/inline4/expat.h | 94 -
external/mit/expat/dist/amiga/include/interfaces/expat.h | 98 -
external/mit/expat/dist/amiga/include/libraries/expat.h | 566 ---------
external/mit/expat/dist/amiga/include/proto/expat.h | 52 -
external/mit/expat/dist/amiga/launch.c | 57 -
external/mit/expat/dist/bcb5/README.txt | 87 -
external/mit/expat/dist/bcb5/all_projects.bpg | 49 -
external/mit/expat/dist/bcb5/elements.bpf | 4 -
external/mit/expat/dist/bcb5/elements.bpr | 149 --
external/mit/expat/dist/bcb5/elements.mak | 186 --
external/mit/expat/dist/bcb5/expat.bpf | 6 -
external/mit/expat/dist/bcb5/expat.bpr | 140 --
external/mit/expat/dist/bcb5/expat.mak | 187 --
external/mit/expat/dist/bcb5/expat_static.bpf | 5 -
external/mit/expat/dist/bcb5/expat_static.bpr | 143 --
external/mit/expat/dist/bcb5/expat_static.mak | 189 ---
external/mit/expat/dist/bcb5/expatw.bpf | 6 -
external/mit/expat/dist/bcb5/expatw.bpr | 146 --
external/mit/expat/dist/bcb5/expatw.mak | 187 --
external/mit/expat/dist/bcb5/expatw_static.bpf | 5 -
external/mit/expat/dist/bcb5/expatw_static.bpr | 152 --
external/mit/expat/dist/bcb5/expatw_static.mak | 190 ---
external/mit/expat/dist/bcb5/libexpat_mtd.def | 141 --
external/mit/expat/dist/bcb5/libexpatw_mtd.def | 140 --
external/mit/expat/dist/bcb5/makefile.mak | 37 -
external/mit/expat/dist/bcb5/outline.bpf | 4 -
external/mit/expat/dist/bcb5/outline.bpr | 132 --
external/mit/expat/dist/bcb5/outline.mak | 186 --
external/mit/expat/dist/bcb5/setup.bat | 9 -
external/mit/expat/dist/bcb5/xmlwf.bpf | 7 -
external/mit/expat/dist/bcb5/xmlwf.bpr | 136 --
external/mit/expat/dist/bcb5/xmlwf.mak | 187 --
external/mit/expat/dist/configure.in | 155 --
external/mit/expat/dist/examples/elements.dsp | 103 -
external/mit/expat/dist/examples/outline.dsp | 103 -
external/mit/expat/dist/expat.dsw | 110 -
external/mit/expat/dist/lib/Makefile.MPW | 206 ---
external/mit/expat/dist/lib/amigaconfig.h | 29 -
external/mit/expat/dist/lib/expat.dsp | 185 --
external/mit/expat/dist/lib/expat_static.dsp | 162 --
external/mit/expat/dist/lib/expatw.dsp | 185 --
external/mit/expat/dist/lib/expatw_static.dsp | 162 --
external/mit/expat/dist/lib/macconfig.h | 53 -
external/mit/expat/dist/lib/xmlparse.c | 613 +++++++-
external/mit/expat/dist/lib/xmltok.c | 34 +-
external/mit/expat/dist/tests/benchmark/benchmark.dsp | 88 -
external/mit/expat/dist/tests/benchmark/benchmark.dsw | 44 -
external/mit/expat/dist/tests/xmltest.sh | 7 +-
external/mit/expat/dist/vms/README.vms | 23 -
external/mit/expat/dist/vms/descrip.mms | 70 -
external/mit/expat/dist/vms/expat_config.h | 52 -
external/mit/expat/dist/xmlwf/xmlwf.dsp | 139 --
61 files changed, 507 insertions(+), 8401 deletions(-)
diffs (truncated from 9813 to 300 lines):
diff -r 4b1001fed11c -r b8aa99b42c64 external/mit/expat/dist/amiga/Makefile
--- a/external/mit/expat/dist/amiga/Makefile Sat Jun 17 21:59:01 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,336 +0,0 @@
-#
-# Makefile for AmigaOS
-#
-
-.PHONY: help all check clean package
-.PHONY: clib2 newlib library so
-
-vpath %.c ../lib ../examples ../xmlwf ../tests ../tests/benchmark
-vpath %.h ../lib ../tests
-
-#############################################################################
-
-help:
- @echo "Requires:"
- @echo " AmigaOS 4.x"
- @echo " SDK 53.13"
- @echo ""
- @echo "Targets:"
- @echo " all - make libraries, xmlwf, examples and runs tests"
- @echo " install - install expat libraries and tools into SDK"
- @echo " clean - clean object files"
- @echo " check - run all the tests"
- @echo " package - prepare distribution archive"
-
-all: clib2 newlib library so check
-
-clib2: clib2/libexpat.a clib2/xmlwf clib2/elements clib2/outline clib2/runtests clib2/benchmark
-
-newlib: newlib/libexpat.a newlib/xmlwf newlib/elements newlib/outline newlib/runtests newlib/benchmark
-
-library: libs/expat.library libs/xmlwf libs/elements libs/outline libs/runtests libs/benchmark
-
-so: so/libexpat.so so/xmlwf so/elements so/outline so/runtests so/benchmark
-
-check: clib2/runtests newlib/runtests libs/runtests so/runtests
- clib2/runtests
- newlib/runtests
- libs/runtests
- so/runtests
-
-clean:
- -delete clib2/#?.o quiet
- -delete newlib/#?.o quiet
- -delete libs/#?.o quiet
- -delete so/#?.o quiet
-
-package:
- $(MAKE) all
- -delete T:expat all force quiet
- makedir all T:expat/Workbench/Libs
- copy clone libs/expat.library T:expat/Workbench/Libs
- makedir all T:expat/Workbench/SObjs
- copy clone so/libexpat.so T:expat/Workbench/SObjs
- makedir all T:expat/SDK/Local/C
- copy clone libs/xmlwf T:expat/SDK/Local/C
- makedir all T:expat/SDK/Local/clib2/lib
- copy clone clib2/libexpat.a T:expat/SDK/Local/clib2/lib
- makedir all T:expat/SDK/Local/newlib/lib
- copy clone newlib/libexpat.a T:expat/SDK/Local/newlib/lib
- makedir all T:expat/SDK/Local/common/include
- copy clone /lib/expat.h /lib/expat_external.h T:expat/SDK/Local/common/include
- makedir all T:expat/SDK/Include/include_h/inline4
- copy clone include/inline4/expat.h T:expat/SDK/Include/include_h/inline4
- makedir all T:expat/SDK/Include/include_h/interfaces
- copy clone include/interfaces/expat.h T:expat/SDK/Include/include_h/interfaces
- makedir all T:expat/SDK/Include/include_h/libraries
- copy clone include/libraries/expat.h T:expat/SDK/Include/include_h/libraries
- makedir all T:expat/SDK/Include/include_h/proto
- copy clone include/proto/expat.h T:expat/SDK/Include/include_h/proto
- makedir all T:expat/SDK/Documentation/Libs/Expat
- copy clone /COPYING T:expat/SDK/Documentation/Libs/Expat
- copy clone /README T:expat/SDK/Documentation/Libs/Expat
- copy clone README.txt T:expat/SDK/Documentation/Libs/Expat/README.AmigaOS
- -delete expat.lha
- lha -r a expat.lha T:expat
-
-#############################################################################
-
-CC := gcc
-LIBTOOL := ar
-STRIP := strip
-
-CFLAGS := -DNDEBUG -O3
-LTFLAGS := -crs
-STRIPFLAGS := -R.comment
-
-#############################################################################
-
-clib2/libexpat.a: clib2/xmlparse.o clib2/xmltok.o clib2/xmlrole.o
- $(LIBTOOL) $(LTFLAGS) $@ $^
- protect $@ -e
-
-clib2/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
- expat_external.h internal.h amigaconfig.h
-
-clib2/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \
- internal.h amigaconfig.h
-
-clib2/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \
- iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \
- expat_external.h internal.h amigaconfig.h
-
-#############################################################################
-
-clib2/xmlwf: clib2/xmlwf.o clib2/xmlfile.o clib2/codepage.o clib2/readfilemap.o
- $(CC) -mcrt=clib2 $^ -o $@ clib2/libexpat.a
- $(STRIP) $(STRIPFLAGS) $@
-
-clib2/xmlwf.o: xmlwf.c
-
-clib2/xmlfile.o: xmlfile.c
-
-clib2/codepage.o: codepage.c
-
-clib2/readfilemap.o: readfilemap.c
-
-#############################################################################
-
-clib2/elements: clib2/elements.o
- $(CC) -mcrt=clib2 $^ -o $@ clib2/libexpat.a
- $(STRIP) $(STRIPFLAGS) $@
-
-clib2/elements.o: elements.c
-
-#############################################################################
-
-clib2/outline: clib2/outline.o
- $(CC) -mcrt=clib2 $^ -o $@ clib2/libexpat.a
- $(STRIP) $(STRIPFLAGS) $@
-
-clib2/outline.o: outline.c
-
-#############################################################################
-
-clib2/runtests: clib2/runtests.o clib2/chardata.o clib2/minicheck.o
- $(CC) -mcrt=clib2 $^ -o $@ clib2/libexpat.a
-
-clib2/chardata.o: chardata.c chardata.h
-
-clib2/minicheck.o: minicheck.c minicheck.h
-
-clib2/runtests.o: runtests.c chardata.h
-
-#############################################################################
-
-clib2/benchmark: clib2/benchmark.o
- $(CC) -mcrt=clib2 $^ -o $@ clib2/libexpat.a -lm
-
-clib2/benchmark.o: benchmark.c
-
-#############################################################################
-
-newlib/libexpat.a: newlib/xmlparse.o newlib/xmltok.o newlib/xmlrole.o
- $(LIBTOOL) $(LTFLAGS) $@ $^
- protect $@ -e
-
-newlib/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
- expat_external.h internal.h amigaconfig.h
-
-newlib/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \
- internal.h amigaconfig.h
-
-newlib/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \
- iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \
- expat_external.h internal.h amigaconfig.h
-
-#############################################################################
-
-newlib/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o
- $(CC) -mcrt=newlib $^ -o $@ newlib/libexpat.a
- $(STRIP) $(STRIPFLAGS) $@
-
-newlib/xmlwf.o: xmlwf.c
-
-newlib/xmlfile.o: xmlfile.c
-
-newlib/codepage.o: codepage.c
-
-newlib/readfilemap.o: readfilemap.c
-
-#############################################################################
-
-newlib/elements: newlib/elements.o
- $(CC) -mcrt=newlib $^ -o $@ newlib/libexpat.a
- $(STRIP) $(STRIPFLAGS) $@
-
-newlib/elements.o: elements.c
-
-#############################################################################
-
-newlib/outline: newlib/outline.o
- $(CC) -mcrt=newlib $^ -o $@ newlib/libexpat.a
- $(STRIP) $(STRIPFLAGS) $@
-
-newlib/outline.o: outline.c
-
-#############################################################################
-
-newlib/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o
- $(CC) -mcrt=newlib $^ -o $@ newlib/libexpat.a
-
-newlib/chardata.o: chardata.c chardata.h
-
-newlib/minicheck.o: minicheck.c minicheck.h
-
-newlib/runtests.o: runtests.c chardata.h
-
-#############################################################################
-
-newlib/benchmark: newlib/benchmark.o
- $(CC) -mcrt=newlib $^ -o $@ newlib/libexpat.a
-
-newlib/benchmark.o: benchmark.c
-
-#############################################################################
-
-libs/expat.library: libs/expat_lib.o libs/expat_68k.o libs/expat_68k_handler_stubs.o libs/expat_vectors.o newlib/libexpat.a
- $(CC) -mcrt=newlib -nostartfiles $^ -o $@ newlib/libexpat.a -Wl,--cref,-M,-Map=$@.map
- protect $@ -e
- $(STRIP) $(STRIPFLAGS) $@
-
-libs/expat_lib.o: expat_lib.c expat_base.h
-
-libs/expat_68k.o: expat_68k.c expat_68k.h expat_base.h
-
-libs/expat_68k_handler_stubs.o: expat_68k_handler_stubs.c expat_68k.h
-
-libs/expat_vectors.o: expat_vectors.c
-
-libs/launch.o: launch.c
-
-#############################################################################
-
-libs/xmlwf: libs/xmlwf.o libs/xmlfile.o libs/codepage.o libs/readfilemap.o libs/launch.o
- $(CC) -mcrt=newlib $^ -o $@
- $(STRIP) $(STRIPFLAGS) $@
-
-libs/xmlwf.o: xmlwf.c
-
-libs/xmlfile.o: xmlfile.c
-
-libs/codepage.o: codepage.c
-
-libs/readfilemap.o: readfilemap.c
-
-#############################################################################
-
-libs/elements: libs/elements.o libs/launch.o
- $(CC) -mcrt=newlib $^ -o $@
- $(STRIP) $(STRIPFLAGS) $@
-
-libs/elements.o: elements.c
-
-#############################################################################
-
-libs/outline: libs/outline.o libs/launch.o
- $(CC) -mcrt=newlib $^ -o $@
- $(STRIP) $(STRIPFLAGS) $@
-
-libs/outline.o: outline.c
-
-#############################################################################
-
-libs/runtests: libs/runtests.o libs/chardata.o libs/minicheck.o libs/launch.o
- $(CC) -mcrt=newlib $^ -o $@
-
-libs/chardata.o: chardata.c chardata.h
-
-libs/minicheck.o: minicheck.c minicheck.h
-
-libs/runtests.o: runtests.c chardata.h
-
-#############################################################################
-
-libs/benchmark: libs/benchmark.o libs/launch.o
- $(CC) -mcrt=newlib $^ -o $@
-
-libs/benchmark.o: benchmark.c
-
-#############################################################################
-
-so/libexpat.so: so/xmlparse.o so/xmltok.o so/xmlrole.o
- $(CC) -mcrt=newlib -shared -o $@ $^
- protect $@ -e
-
-so/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
- expat_external.h internal.h amigaconfig.h
-
-so/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \
- internal.h amigaconfig.h
-
-so/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \
- iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \
- expat_external.h internal.h amigaconfig.h
-
-#############################################################################
Home |
Main Index |
Thread Index |
Old Index