diff --git a/Makefile b/Makefile index eec613249a..943f30c9cd 100644 --- a/Makefile +++ b/Makefile @@ -9,39 +9,39 @@ include $(configdir)/Makefile.def .NOTPARALLEL: -all: config-all ofstd-all oflog-all dcmdata-all dcmiod-all dcmfg-all dcmseg-all dcmimgle-all dcmimage-all dcmjpeg-all dcmjpls-all dcmtls-all dcmnet-all dcmsr-all dcmsign-all dcmwlm-all dcmqrdb-all dcmpstat-all dcmrt-all dcmtract-all dcmpmap-all dcmect-all +all: config-all oficonv-all ofstd-all oflog-all dcmdata-all dcmiod-all dcmfg-all dcmseg-all dcmimgle-all dcmimage-all dcmjpeg-all dcmjpls-all dcmtls-all dcmnet-all dcmsr-all dcmsign-all dcmwlm-all dcmqrdb-all dcmpstat-all dcmrt-all dcmtract-all dcmpmap-all dcmect-all -libsrc-all: ofstd-libsrc-all oflog-libsrc-all dcmdata-libsrc-all dcmiod-libsrc-all dcmfg-libsrc-all dcmseg-libsrc-all dcmimgle-libsrc-all dcmimage-libsrc-all dcmjpeg-libsrc-all dcmjpls-libsrc-all dcmtls-libsrc-all dcmnet-libsrc-all dcmsr-libsrc-all dcmsign-libsrc-all dcmwlm-libsrc-all dcmqrdb-libsrc-all dcmpstat-libsrc-all dcmrt-libsrc-all dcmtract-libsrc-all dcmpmap-libsrc-all dcmect-libsrc-all +libsrc-all: oficonv-libsrc-all ofstd-libsrc-all oflog-libsrc-all dcmdata-libsrc-all dcmiod-libsrc-all dcmfg-libsrc-all dcmseg-libsrc-all dcmimgle-libsrc-all dcmimage-libsrc-all dcmjpeg-libsrc-all dcmjpls-libsrc-all dcmtls-libsrc-all dcmnet-libsrc-all dcmsr-libsrc-all dcmsign-libsrc-all dcmwlm-libsrc-all dcmqrdb-libsrc-all dcmpstat-libsrc-all dcmrt-libsrc-all dcmtract-libsrc-all dcmpmap-libsrc-all dcmect-libsrc-all -tests-all: config-tests-all ofstd-tests-all oflog-tests-all dcmdata-tests-all dcmiod-tests-all dcmfg-tests-all dcmseg-tests-all dcmimgle-tests-all dcmimage-tests-all dcmjpeg-tests-all dcmjpls-tests-all dcmtls-tests-all dcmnet-tests-all dcmsr-tests-all dcmsign-tests-all dcmwlm-tests-all dcmqrdb-tests-all dcmpstat-tests-all dcmrt-tests-all dcmtract-tests-all dcmpmap-tests-all dcmect-tests-all +tests-all: config-tests-all oficonv-tests-all ofstd-tests-all oflog-tests-all dcmdata-tests-all dcmiod-tests-all dcmfg-tests-all dcmseg-tests-all dcmimgle-tests-all dcmimage-tests-all dcmjpeg-tests-all dcmjpls-tests-all dcmtls-tests-all dcmnet-tests-all dcmsr-tests-all dcmsign-tests-all dcmwlm-tests-all dcmqrdb-tests-all dcmpstat-tests-all dcmrt-tests-all dcmtract-tests-all dcmpmap-tests-all dcmect-tests-all -install: config-install ofstd-install oflog-install dcmdata-install dcmiod-install dcmfg-install dcmseg-install dcmimgle-install dcmimage-install dcmjpeg-install dcmjpls-install dcmtls-install dcmnet-install dcmsr-install dcmsign-install dcmwlm-install dcmqrdb-install dcmpstat-install dcmrt-install dcmtract-install dcmpmap-install dcmect-install dcmtk-install-doc install-man +install: config-install oficonv-install ofstd-install oflog-install dcmdata-install dcmiod-install dcmfg-install dcmseg-install dcmimgle-install dcmimage-install dcmjpeg-install dcmjpls-install dcmtls-install dcmnet-install dcmsr-install dcmsign-install dcmwlm-install dcmqrdb-install dcmpstat-install dcmrt-install dcmtract-install dcmpmap-install dcmect-install dcmtk-install-doc install-man install-all: install install-lib install-html -install-bin: config-install-bin ofstd-install-bin oflog-install-bin dcmdata-install-bin dcmiod-install-bin dcmfg-install-bin dcmseg-install-bin dcmimgle-install-bin dcmimage-install-bin dcmjpeg-install-bin dcmjpls-install-bin dcmtls-install-bin dcmnet-install-bin dcmsr-install-bin dcmsign-install-bin dcmwlm-install-bin dcmqrdb-install-bin dcmpstat-install-bin dcmrt-install-bin dcmtract-install-bin dcmpmap-install-bin dcmect-install-bin +install-bin: config-install-bin oficonv-install-bin ofstd-install-bin oflog-install-bin dcmdata-install-bin dcmiod-install-bin dcmfg-install-bin dcmseg-install-bin dcmimgle-install-bin dcmimage-install-bin dcmjpeg-install-bin dcmjpls-install-bin dcmtls-install-bin dcmnet-install-bin dcmsr-install-bin dcmsign-install-bin dcmwlm-install-bin dcmqrdb-install-bin dcmpstat-install-bin dcmrt-install-bin dcmtract-install-bin dcmpmap-install-bin dcmect-install-bin -install-doc: config-install-doc ofstd-install-doc oflog-install-doc dcmdata-install-doc dcmiod-install-doc dcmfg-install-doc dcmseg-install-doc dcmimgle-install-doc dcmimage-install-doc dcmjpeg-install-doc dcmjpls-install-doc dcmtls-install-doc dcmnet-install-doc dcmsr-install-doc dcmsign-install-doc dcmwlm-install-doc dcmqrdb-install-doc dcmpstat-install-doc dcmrt-install-doc dcmtract-install-doc dcmpmap-install-doc dcmect-install-doc +install-doc: config-install-doc oficonv-install-doc ofstd-install-doc oflog-install-doc dcmdata-install-doc dcmiod-install-doc dcmfg-install-doc dcmseg-install-doc dcmimgle-install-doc dcmimage-install-doc dcmjpeg-install-doc dcmjpls-install-doc dcmtls-install-doc dcmnet-install-doc dcmsr-install-doc dcmsign-install-doc dcmwlm-install-doc dcmqrdb-install-doc dcmpstat-install-doc dcmrt-install-doc dcmtract-install-doc dcmpmap-install-doc dcmect-install-doc -install-data: config-install-data ofstd-install-data oflog-install-data dcmdata-install-data dcmiod-install-data dcmfg-install-data dcmseg-install-data dcmimgle-install-data dcmimage-install-data dcmjpeg-install-data dcmjpls-install-data dcmtls-install-data dcmnet-install-data dcmsr-install-data dcmsign-install-data dcmwlm-install-data dcmqrdb-install-data dcmpstat-install-data dcmrt-install-data dcmtract-install-data dcmpmap-install-data dcmect-install-data +install-data: config-install-data oficonv-install-data ofstd-install-data oflog-install-data dcmdata-install-data dcmiod-install-data dcmfg-install-data dcmseg-install-data dcmimgle-install-data dcmimage-install-data dcmjpeg-install-data dcmjpls-install-data dcmtls-install-data dcmnet-install-data dcmsr-install-data dcmsign-install-data dcmwlm-install-data dcmqrdb-install-data dcmpstat-install-data dcmrt-install-data dcmtract-install-data dcmpmap-install-data dcmect-install-data -install-etc: config-install-etc ofstd-install-etc oflog-install-etc dcmdata-install-etc dcmiod-install-etc dcmfg-install-etc dcmseg-install-etc dcmimgle-install-etc dcmimage-install-etc dcmjpeg-install-etc dcmjpls-install-etc dcmtls-install-etc dcmnet-install-etc dcmsr-install-etc dcmsign-install-etc dcmwlm-install-etc dcmqrdb-install-etc dcmpstat-install-etc dcmrt-install-etc dcmtract-install-etc dcmpmap-install-etc dcmect-install-etc +install-etc: config-install-etc oficonv-install-etc ofstd-install-etc oflog-install-etc dcmdata-install-etc dcmiod-install-etc dcmfg-install-etc dcmseg-install-etc dcmimgle-install-etc dcmimage-install-etc dcmjpeg-install-etc dcmjpls-install-etc dcmtls-install-etc dcmnet-install-etc dcmsr-install-etc dcmsign-install-etc dcmwlm-install-etc dcmqrdb-install-etc dcmpstat-install-etc dcmrt-install-etc dcmtract-install-etc dcmpmap-install-etc dcmect-install-etc -install-lib: config-install-lib ofstd-install-lib oflog-install-lib dcmdata-install-lib dcmiod-install-lib dcmfg-install-lib dcmseg-install-lib dcmimgle-install-lib dcmimage-install-lib dcmjpeg-install-lib dcmjpls-install-lib dcmtls-install-lib dcmnet-install-lib dcmsr-install-lib dcmsign-install-lib dcmwlm-install-lib dcmqrdb-install-lib dcmpstat-install-lib dcmrt-install-lib dcmtract-install-lib dcmpmap-install-lib dcmect-install-lib +install-lib: config-install-lib oficonv-install-lib ofstd-install-lib oflog-install-lib dcmdata-install-lib dcmiod-install-lib dcmfg-install-lib dcmseg-install-lib dcmimgle-install-lib dcmimage-install-lib dcmjpeg-install-lib dcmjpls-install-lib dcmtls-install-lib dcmnet-install-lib dcmsr-install-lib dcmsign-install-lib dcmwlm-install-lib dcmqrdb-install-lib dcmpstat-install-lib dcmrt-install-lib dcmtract-install-lib dcmpmap-install-lib dcmect-install-lib -install-include: config-install-include ofstd-install-include oflog-install-include dcmdata-install-include dcmiod-install-include dcmfg-install-include dcmseg-install-include dcmimgle-install-include dcmimage-install-include dcmjpeg-install-include dcmjpls-install-include dcmtls-install-include dcmnet-install-include dcmsr-install-include dcmsign-install-include dcmwlm-install-include dcmqrdb-install-include dcmpstat-install-include dcmrt-install-include dcmtract-install-include dcmpmap-install-include dcmect-install-include +install-include: config-install-include oficonv-install-include ofstd-install-include oflog-install-include dcmdata-install-include dcmiod-install-include dcmfg-install-include dcmseg-install-include dcmimgle-install-include dcmimage-install-include dcmjpeg-install-include dcmjpls-install-include dcmtls-install-include dcmnet-install-include dcmsr-install-include dcmsign-install-include dcmwlm-install-include dcmqrdb-install-include dcmpstat-install-include dcmrt-install-include dcmtract-install-include dcmpmap-install-include dcmect-install-include -install-support: config-install-support ofstd-install-support oflog-install-support dcmdata-install-support dcmiod-install-support dcmfg-install-support dcmseg-install-support dcmimgle-install-support dcmimage-install-support dcmjpeg-install-support dcmjpls-install-support dcmtls-install-support dcmnet-install-support dcmsr-install-support dcmsign-install-support dcmwlm-install-support dcmqrdb-install-support dcmpstat-install-support dcmrt-install-support dcmtract-install-support dcmpmap-install-support dcmect-install-support +install-support: config-install-support oficonv-install-support ofstd-install-support oflog-install-support dcmdata-install-support dcmiod-install-support dcmfg-install-support dcmseg-install-support dcmimgle-install-support dcmimage-install-support dcmjpeg-install-support dcmjpls-install-support dcmtls-install-support dcmnet-install-support dcmsr-install-support dcmsign-install-support dcmwlm-install-support dcmqrdb-install-support dcmpstat-install-support dcmrt-install-support dcmtract-install-support dcmpmap-install-support dcmect-install-support check: tests-all $(MAKE) -s check-nosilent -check-nosilent: config-check ofstd-check oflog-check dcmdata-check dcmiod-check dcmfg-check dcmseg-check dcmimgle-check dcmimage-check dcmjpeg-check dcmjpls-check dcmtls-check dcmnet-check dcmsr-check dcmsign-check dcmwlm-check dcmqrdb-check dcmpstat-check dcmrt-check dcmtract-check dcmpmap-check dcmect-check +check-nosilent: config-check oficonv-check ofstd-check oflog-check dcmdata-check dcmiod-check dcmfg-check dcmseg-check dcmimgle-check dcmimage-check dcmjpeg-check dcmjpls-check dcmtls-check dcmnet-check dcmsr-check dcmsign-check dcmwlm-check dcmqrdb-check dcmpstat-check dcmrt-check dcmtract-check dcmpmap-check dcmect-check check-exhaustive: tests-all $(MAKE) -s check-nosilent-exhaustive -check-nosilent-exhaustive: config-check-exhaustive ofstd-check-exhaustive oflog-check-exhaustive dcmdata-check-exhaustive dcmiod-check-exhaustive dcmfg-check-exhaustive dcmseg-check-exhaustive dcmimgle-check-exhaustive dcmimage-check-exhaustive dcmjpeg-check-exhaustive dcmjpls-check-exhaustive dcmtls-check-exhaustive dcmnet-check-exhaustive dcmsr-check-exhaustive dcmsign-check-exhaustive dcmwlm-check-exhaustive dcmqrdb-check-exhaustive dcmpstat-check-exhaustive dcmrt-check-exhaustive dcmtract-check-exhaustive dcmpmap-check-exhaustive dcmect-check-exhaustive +check-nosilent-exhaustive: config-check-exhaustive oficonv-check-exhaustive ofstd-check-exhaustive oflog-check-exhaustive dcmdata-check-exhaustive dcmiod-check-exhaustive dcmfg-check-exhaustive dcmseg-check-exhaustive dcmimgle-check-exhaustive dcmimage-check-exhaustive dcmjpeg-check-exhaustive dcmjpls-check-exhaustive dcmtls-check-exhaustive dcmnet-check-exhaustive dcmsr-check-exhaustive dcmsign-check-exhaustive dcmwlm-check-exhaustive dcmqrdb-check-exhaustive dcmpstat-check-exhaustive dcmrt-check-exhaustive dcmtract-check-exhaustive dcmpmap-check-exhaustive dcmect-check-exhaustive dcmtk-install-doc: $(configdir)/mkinstalldirs $(DESTDIR)$(docdir) @@ -91,7 +91,7 @@ help: @echo "" @echo "The following modules are available:" @echo "" - @echo "ofstd oflog dcmdata dcmiod dcmfg dcmseg dcmimgle dcmimage dcmjpeg dcmjpls dcmtls dcmnet dcmsr dcmsign dcmwlm dcmqrdb dcmpstat dcmrt dcmtract dcmpmap dcmect" + @echo "oficonv ofstd oflog dcmdata dcmiod dcmfg dcmseg dcmimgle dcmimage dcmjpeg dcmjpls dcmtls dcmnet dcmsr dcmsign dcmwlm dcmqrdb dcmpstat dcmrt dcmtract dcmpmap dcmect" config-all: (cd config && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" all) @@ -132,6 +132,45 @@ config-check: config-check-exhaustive: (cd config && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" check-exhaustive) +oficonv-all: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" all) + +oficonv-libsrc-all: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" libsrc-all) + +oficonv-tests-all: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" tests-all) + +oficonv-install: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install) + +oficonv-install-bin: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-bin) + +oficonv-install-doc: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-doc) + +oficonv-install-data: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-data) + +oficonv-install-etc: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-etc) + +oficonv-install-lib: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-lib) + +oficonv-install-include: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-include) + +oficonv-install-support: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-support) + +oficonv-check: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" check) + +oficonv-check-exhaustive: + (cd oficonv && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" check-exhaustive) + ofstd-all: (cd ofstd && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" all) @@ -953,6 +992,7 @@ dcmect-check-exhaustive: dependencies: -(cd config && $(MAKE) dependencies) + (cd oficonv && $(MAKE) dependencies) (cd ofstd && $(MAKE) dependencies) (cd oflog && $(MAKE) dependencies) (cd dcmdata && $(MAKE) dependencies) @@ -976,6 +1016,7 @@ dependencies: (cd dcmect && $(MAKE) dependencies) clean: + (cd oficonv && $(MAKE) clean) (cd ofstd && $(MAKE) clean) (cd oflog && $(MAKE) clean) (cd dcmdata && $(MAKE) clean) @@ -1002,6 +1043,7 @@ clean: rm -f $(TRASH) distclean: + (cd oficonv && $(MAKE) distclean) (cd ofstd && $(MAKE) distclean) (cd oflog && $(MAKE) distclean) (cd dcmdata && $(MAKE) distclean) diff --git a/config/modules b/config/modules index 20298ba5e8..467e33371a 100644 --- a/config/modules +++ b/config/modules @@ -1 +1 @@ -ofstd oflog dcmdata dcmiod dcmfg dcmseg dcmimgle dcmimage dcmjpeg dcmjpls dcmtls dcmnet dcmsr dcmsign dcmwlm dcmqrdb dcmpstat dcmrt dcmtract dcmpmap dcmect +oficonv ofstd oflog dcmdata dcmiod dcmfg dcmseg dcmimgle dcmimage dcmjpeg dcmjpls dcmtls dcmnet dcmsr dcmsign dcmwlm dcmqrdb dcmpstat dcmrt dcmtract dcmpmap dcmect diff --git a/dcmdata/apps/Makefile.in b/dcmdata/apps/Makefile.in index 26e9e8cdf4..f9ab2fc1b4 100644 --- a/dcmdata/apps/Makefile.in +++ b/dcmdata/apps/Makefile.in @@ -14,11 +14,12 @@ include $(configdir)/@common_makefile@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog +oficonvdir = $(top_srcdir)/../oficonv -LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include +LOCALINCLUDES = -I$(oficonvdir)/include -I$(ofstddir)/include -I$(oflogdir)/include LIBDIRS = -L$(top_srcdir)/libi2d -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc \ - -L$(oflogdir)/libsrc -L$(top_srcdir)/libdcxml -LOCALLIBS = -ldcmdata -loflog -lofstd $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) + -L$(oflogdir)/libsrc -L$(top_srcdir)/libdcxml -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmdata -loflog -lofstd -loficonv $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) LIBI2D = -li2d LIBDCMXML = -ldcmxml diff --git a/dcmdata/libsrc/Makefile.in b/dcmdata/libsrc/Makefile.in index ed5ef7824d..f8b51a190b 100644 --- a/dcmdata/libsrc/Makefile.in +++ b/dcmdata/libsrc/Makefile.in @@ -14,10 +14,11 @@ include $(configdir)/@common_makefile@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog +oficonvdir = $(top_srcdir)/../oficonv -LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -LOCALLIBS = -loflog -lofstd $(CHARCONVLIBS) +LOCALINCLUDES = -I$(oficonvdir)/include -I$(ofstddir)/include -I$(oflogdir)/include +LIBDIRS = -L$(oficonvdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc +LOCALLIBS = -loflog -lofstd -loficonv $(CHARCONVLIBS) LOCALDEFS = # clear environment variable in the scope of this makefile diff --git a/dcmdata/tests/Makefile.in b/dcmdata/tests/Makefile.in index fc84fc00ca..62f4b115b0 100644 --- a/dcmdata/tests/Makefile.in +++ b/dcmdata/tests/Makefile.in @@ -14,11 +14,12 @@ include $(configdir)/@common_makefile@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(top_srcdir)/include -I$(ofstddir)/include -I$(oflogdir)/include LIBDIRS = -L$(top_srcdir)/libsrc -L$(top_srcdir)/libi2d -L$(ofstddir)/libsrc \ - -L$(oflogdir)/libsrc -L$(top_srcdir)/libdcxml -LOCALLIBS = -ldcmdata -loflog -lofstd $(ZLIBLIBS) $(XMLLIBS) $(CHARCONVLIBS) $(MATHLIBS) + -L$(oflogdir)/libsrc -L$(top_srcdir)/libdcxml -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmdata -loflog -lofstd -loficonv $(ZLIBLIBS) $(XMLLIBS) $(CHARCONVLIBS) $(MATHLIBS) I2DLIBS = -li2d LIBDCMXML = -ldcmxml diff --git a/dcmect/tests/Makefile.in b/dcmect/tests/Makefile.in index 78b6ae5cbc..7da79c4ab3 100644 --- a/dcmect/tests/Makefile.in +++ b/dcmect/tests/Makefile.in @@ -17,10 +17,11 @@ oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmioddir = $(top_srcdir)/../dcmiod dcmfgdir = $(top_srcdir)/../dcmfg +oficonvdir = $(top_srcdir)/../oficonv LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc \ - -L$(dcmdatadir)/libsrc -L$(dcmioddir)/libsrc -L$(dcmfgdir)/libsrc -LOCALLIBS = -ldcmect -ldcmfg -ldcmiod -ldcmdata -loflog -lofstd $(ZLIBLIBS) \ + -L$(dcmdatadir)/libsrc -L$(dcmioddir)/libsrc -L$(dcmfgdir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmect -ldcmfg -ldcmiod -ldcmdata -loflog -lofstd -loficonv $(ZLIBLIBS) \ $(CHARCONVLIBS) $(MATHLIBS) LOCALINCLUDES = -I$(top_srcdir)/include -I$(ofstddir)/include -I$(oflogdir)/include \ -I$(dcmdatadir)/include -I$(dcmioddir)/include -I$(dcmfgdir)/include diff --git a/dcmfg/tests/Makefile.in b/dcmfg/tests/Makefile.in index 4de6261261..d2c46caf51 100644 --- a/dcmfg/tests/Makefile.in +++ b/dcmfg/tests/Makefile.in @@ -16,10 +16,11 @@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmioddir = $(top_srcdir)/../dcmiod +oficonvdir = $(top_srcdir)/../oficonv LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc \ - -L$(dcmdatadir)/libsrc -L$(dcmioddir)/libsrc -LOCALLIBS = -ldcmfg -ldcmiod -ldcmdata -loflog -lofstd $(ZLIBLIBS) \ + -L$(dcmdatadir)/libsrc -L$(dcmioddir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmfg -ldcmiod -ldcmdata -loflog -lofstd -loficonv $(ZLIBLIBS) \ $(CHARCONVLIBS) $(MATHLIBS) LOCALINCLUDES = -I$(top_srcdir)/include -I$(ofstddir)/include -I$(oflogdir)/include \ -I$(dcmdatadir)/include -I$(dcmioddir)/include diff --git a/dcmimage/apps/Makefile.in b/dcmimage/apps/Makefile.in index 759b8a26c2..f1de274482 100644 --- a/dcmimage/apps/Makefile.in +++ b/dcmimage/apps/Makefile.in @@ -16,12 +16,13 @@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmimgledir = $(top_srcdir)/../dcmimgle +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include \ -I$(dcmdatadir)/include -I$(dcmimgledir)/include LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc \ - -L$(dcmdatadir)/libsrc -L$(dcmimgledir)/libsrc -LOCALLIBS = -ldcmimage -ldcmimgle -ldcmdata -loflog -lofstd $(TIFFLIBS) $(PNGLIBS) \ + -L$(dcmdatadir)/libsrc -L$(dcmimgledir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmimage -ldcmimgle -ldcmdata -loflog -lofstd -loficonv $(TIFFLIBS) $(PNGLIBS) \ $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) objs = dcm2pnm.o dcmquant.o dcmscale.o dcmicmp.o diff --git a/dcmimgle/apps/Makefile.in b/dcmimgle/apps/Makefile.in index cb876bb262..92a30d8cb3 100644 --- a/dcmimgle/apps/Makefile.in +++ b/dcmimgle/apps/Makefile.in @@ -15,10 +15,11 @@ include $(configdir)/@common_makefile@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include -LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -LOCALLIBS = -ldcmimgle -ldcmdata -loflog -lofstd $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) +LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmimgle -ldcmdata -loflog -lofstd -loficonv $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) objs = dconvlum.o dcmdspfn.o dcod2lum.o progs = dconvlum dcmdspfn dcod2lum diff --git a/dcmiod/tests/Makefile.in b/dcmiod/tests/Makefile.in index 05d44501d3..d1b5bfa92a 100644 --- a/dcmiod/tests/Makefile.in +++ b/dcmiod/tests/Makefile.in @@ -16,12 +16,13 @@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmioddir = $(top_srcdir)/../dcmiod +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(dcmioddir)/include -I$(dcmdatadir)/include -I$(oflogdir)/include \ -I$(ofstddir)/include LIBDIRS = -L$(top_srcdir)/libsrc -L$(dcmioddir)/libsrc -L$(dcmdatadir)/libsrc \ - -L$(oflogdir)/libsrc -L$(ofstddir)/libsrc -LOCALLIBS = -ldcmiod -ldcmdata -loflog -lofstd \ + -L$(oflogdir)/libsrc -L$(ofstddir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmiod -ldcmdata -loflog -lofstd -loficonv \ $(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) test_objs = tests.o tcielabutil.o tcodes.o timagepixel.o diff --git a/dcmjpeg/apps/Makefile.in b/dcmjpeg/apps/Makefile.in index 136d83f2ba..4d1bb548f4 100644 --- a/dcmjpeg/apps/Makefile.in +++ b/dcmjpeg/apps/Makefile.in @@ -18,6 +18,11 @@ ofstdinc = -I$(ofstddir)/include ofstdlibdir = -L$(ofstddir)/libsrc ofstdlib = -lofstd +oficonvdir = $(top_srcdir)/../oficonv +oficonvinc = -I$(oficonvdir)/include +oficonvlibdir = -L$(oficonvdir)/libsrc +oficonvlib = -loficonv + oflogdir = $(top_srcdir)/../oflog ofloginc = -I$(oflogdir)/include ofloglibdir = -L$(oflogdir)/libsrc @@ -47,9 +52,9 @@ dcmjpeglib = -ldcmjpeg -lijg8 -lijg12 -lijg16 LOCALINCLUDES = $(dcmjpeginc) $(ofstdinc) $(ofloginc) $(dcmdatainc) $(dcmimageinc) \ $(dcmimgleinc) LIBDIRS = -L$(top_srcdir)/libsrc $(dcmjpeglibdir) $(dcmimagelibdir) $(dcmimglelibdir) \ - $(dcmdatalibdir) $(ofloglibdir) $(ofstdlibdir) + $(dcmdatalibdir) $(ofloglibdir) $(ofstdlibdir) $(oficonvlibdir) LOCALLIBS = $(dcmjpeglib) $(dcmimagelib) $(dcmimglelib) $(dcmdatalib) $(ofloglib) \ - $(ofstdlib) $(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) + $(ofstdlib) $(oficonvlib) $(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) objs = dcmdjpeg.o dcmcjpeg.o dcmj2pnm.o dcmmkdir.o progs = dcmdjpeg dcmcjpeg dcmj2pnm dcmmkdir diff --git a/dcmjpls/apps/Makefile.in b/dcmjpls/apps/Makefile.in index 58608a192f..85496f4811 100644 --- a/dcmjpls/apps/Makefile.in +++ b/dcmjpls/apps/Makefile.in @@ -17,6 +17,11 @@ ofstdinc = -I$(ofstddir)/include ofstdlibdir = -L$(ofstddir)/libsrc ofstdlib = -lofstd +oficonvdir = $(top_srcdir)/../oficonv +oficonvinc = -I$(oficonvdir)/include +oficonvlibdir = -L$(oficonvdir)/libsrc +oficonvlib = -loficonv + oflogdir = $(top_srcdir)/../oflog ofloginc = -I$(oflogdir)/include ofloglibdir = -L$(oflogdir)/libsrc @@ -48,8 +53,8 @@ libcharlslib = -ldcmtkcharls LOCALINCLUDES = $(dcmjplsinc) $(ofstdinc) $(ofloginc) $(dcmdatainc) $(dcmimageinc) $(dcmimgleinc) LIBDIRS = -L$(top_srcdir)/libsrc $(dcmjplslibdir) $(libcharlslibdir) $(dcmimagelibdir) \ - $(dcmimglelibdir) $(dcmdatalibdir) $(ofloglibdir) $(ofstdlibdir) -LOCALLIBS = $(dcmjplslib) $(dcmimagelib) $(dcmimglelib) $(dcmdatalib) $(ofloglib) $(ofstdlib) \ + $(dcmimglelibdir) $(dcmdatalibdir) $(ofloglibdir) $(ofstdlibdir) $(oficonvlibdir) +LOCALLIBS = $(dcmjplslib) $(dcmimagelib) $(dcmimglelib) $(dcmdatalib) $(ofloglib) $(ofstdlib) $(oficonvlib) \ $(libcharlslib) $(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) objs = dcmdjpls.o dcmcjpls.o dcml2pnm.o diff --git a/dcmnet/apps/Makefile.in b/dcmnet/apps/Makefile.in index 625c39c050..6e7382c8b2 100644 --- a/dcmnet/apps/Makefile.in +++ b/dcmnet/apps/Makefile.in @@ -16,6 +16,7 @@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmtlsdir = $(top_srcdir)/../dcmtls +oficonvdir = $(top_srcdir)/../oficonv # these defines are used when compression support is needed for one of the tools compr_includes = -I$(top_srcdir)/../dcmimgle/include -I$(top_srcdir)/../dcmimage/include \ @@ -28,8 +29,8 @@ compr_libdirs = -L$(top_srcdir)/../dcmimgle/libsrc -L$(top_srcdir)/../dcmimage/l LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include \ -I$(dcmdatadir)/include -I$(dcmtlsdir)/include $(compr_includes) LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc \ - -L$(dcmdatadir)/libsrc -L$(dcmtlsdir)/libsrc $(compr_libdirs) -LOCALLIBS = -ldcmnet -ldcmdata -loflog -lofstd $(ZLIBLIBS) $(TCPWRAPPERLIBS) \ + -L$(dcmdatadir)/libsrc -L$(dcmtlsdir)/libsrc -L$(oficonvdir)/libsrc $(compr_libdirs) +LOCALLIBS = -ldcmnet -ldcmdata -loflog -lofstd -loficonv $(ZLIBLIBS) $(TCPWRAPPERLIBS) \ $(CHARCONVLIBS) $(MATHLIBS) DCMTLSLIBS = -ldcmtls COMPR_LIBS = -ldcmjpls -ldcmtkcharls -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle diff --git a/dcmnet/tests/Makefile.in b/dcmnet/tests/Makefile.in index 2d87c9cfce..5cba6bf678 100644 --- a/dcmnet/tests/Makefile.in +++ b/dcmnet/tests/Makefile.in @@ -15,12 +15,14 @@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmtlsdir = $(top_srcdir)/../dcmtls +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include \ -I$(dcmdatadir)/include -I$(dcmtlsdir)/include $(compr_includes) LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc \ - -L$(dcmdatadir)/libsrc -L$(dcmtlsdir)/libsrc $(compr_libdirs) -LOCALLIBS = -ldcmnet -ldcmdata -loflog -lofstd $(ZLIBLIBS) $(TCPWRAPPERLIBS) \ + -L$(dcmdatadir)/libsrc -L$(dcmtlsdir)/libsrc -L$(oficonvdir)/libsrc \ + $(compr_libdirs) +LOCALLIBS = -ldcmnet -ldcmdata -loflog -lofstd -loficonv $(ZLIBLIBS) $(TCPWRAPPERLIBS) \ $(CHARCONVLIBS) $(MATHLIBS) objs = tests.o tdump.o tdimse.o tpool.o tscuscp.o tscusession.o diff --git a/dcmpstat/apps/Makefile.in b/dcmpstat/apps/Makefile.in index 37da8cb209..75b17cf941 100644 --- a/dcmpstat/apps/Makefile.in +++ b/dcmpstat/apps/Makefile.in @@ -17,6 +17,11 @@ ofstdinc = -I$(ofstddir)/include ofstdlibdir = -L$(ofstddir)/libsrc ofstdlib = -lofstd +oficonvdir = $(top_srcdir)/../oficonv +oficonvinc = -I$(oficonvdir)/include +oficonvlibdir = -L$(oficonvdir)/libsrc +oficonvlib = -loficonv + oflogdir = $(top_srcdir)/../oflog ofloginc = -I$(oflogdir)/include ofloglibdir = -L$(oflogdir)/libsrc @@ -76,14 +81,14 @@ LOCALINCLUDES = $(dcmpstatinc) $(ofstdinc) $(ofloginc) $(dcmnetinc) $(dcmdatainc $(dcmiodinc) $(dcmimgleinc) $(dcmqrdbinc) $(dcmtlsinc) $(dcmsigninc) $(dcmsrinc) LIBDIRS = -L$(top_srcdir)/libsrc $(dcmpstatlibdir) $(dcmqrdblibdir) $(dcmnetlibdir) \ $(dcmtlslibdir) $(dcmsignlibdir) $(dcmsrlibdir) $(dcmdatalibdir) $(ofstdlibdir) \ - $(ofloglibdir) $(dcmiodlibdir) $(dcmimglelibdir) $(dcmimagelibdir) + $(ofloglibdir) $(dcmiodlibdir) $(dcmimglelibdir) $(dcmimagelibdir) $(oficonvlibdir) LOCALLIBS = $(dcmpstatlib) $(dcmsignlib) $(dcmsrlib) $(dcmimagelib) $(dcmimglelib) \ - $(dcmqrdblib) $(dcmnetlib) $(dcmtlslib) $(dcmiodlib) $(dcmdatalib) $(ofloglib) \ - $(ofstdlib) $(TIFFLIBS) $(PNGLIBS) $(XMLLIBS) $(ZLIBLIBS) $(TCPWRAPPERLIBS) \ - $(OPENSSLLIBS) $(CHARCONVLIBS) $(MATHLIBS) -DCMMKLUT_LIBS = $(dcmimglelib) $(dcmdatalib) $(ofloglib) $(ofstdlib) $(XMLLIBS) \ + $(dcmqrdblib) $(dcmnetlib) $(dcmtlslib) $(dcmiodlib) $(dcmdatalib) $(ofloglib) $(ofstdlib) \ + $(oficonvlib) $(TIFFLIBS) $(PNGLIBS) $(XMLLIBS) $(ZLIBLIBS) $(TCPWRAPPERLIBS) $(OPENSSLLIBS) \ + $(CHARCONVLIBS) $(MATHLIBS) +DCMMKLUT_LIBS = $(dcmimglelib) $(dcmdatalib) $(ofloglib) $(ofstdlib) $(oficonvlib) $(XMLLIBS) \ $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) -DCMMKCRV_LIBS = $(dcmdatalib) $(ofloglib) $(ofstdlib) $(XMLLIBS) $(ZLIBLIBS) \ +DCMMKCRV_LIBS = $(dcmdatalib) $(ofloglib) $(ofstdlib) $(oficonvlib) $(XMLLIBS) $(ZLIBLIBS) \ $(CHARCONVLIBS) $(MATHLIBS) objs = dcmpsmk.o dcmp2pgm.o dcmmklut.o dcmmkcrv.o dcmpssnd.o dcmpsrcv.o dcmpsprt.o dcmprscu.o \ diff --git a/dcmpstat/tests/Makefile.in b/dcmpstat/tests/Makefile.in index 40d0a994fb..091c273780 100644 --- a/dcmpstat/tests/Makefile.in +++ b/dcmpstat/tests/Makefile.in @@ -22,6 +22,7 @@ dcmimagedir = $(top_srcdir)/../dcmimage dcmsigndir = $(top_srcdir)/../dcmsign dcmtlsdir = $(top_srcdir)/../dcmtls dcmsrdir = $(top_srcdir)/../dcmsr +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(dcmnetdir)/include -I$(ofstddir)/include -I$(oflogdir)/include \ -I$(dcmdatadir)/include -I$(dcmsigndir)/include -I$(dcmtlsdir)/include \ @@ -30,9 +31,9 @@ LOCALINCLUDES = -I$(dcmnetdir)/include -I$(ofstddir)/include -I$(oflogdir)/inclu LIBDIRS = -L$(top_srcdir)/libsrc -L$(dcmnetdir)/libsrc -L$(ofstddir)/libsrc \ -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmsigndir)/libsrc \ -L$(dcmtlsdir)/libsrc -L$(dcmqrdbdir)/libsrc -L$(dcmimgledir)/libsrc \ - -L$(dcmimagedir)/libsrc -L$(dcmsrdir)/libsrc + -L$(dcmimagedir)/libsrc -L$(dcmsrdir)/libsrc -L$(oficonvdir)/libsrc LOCALLIBS = -ldcmpstat -ldcmdsig -ldcmsr -ldcmimage -ldcmimgle -ldcmqrdb -ldcmnet \ - -ldcmtls -ldcmdata -loflog -lofstd $(TIFFLIBS) $(PNGLIBS) $(XMLLIBS) $(ZLIBLIBS) \ + -ldcmtls -ldcmdata -loflog -lofstd -loficonv $(TIFFLIBS) $(PNGLIBS) $(XMLLIBS) $(ZLIBLIBS) \ $(TCPWRAPPERLIBS) $(OPENSSLLIBS) $(CHARCONVLIBS) $(MATHLIBS) objs = msgserv.o diff --git a/dcmqrdb/apps/Makefile.in b/dcmqrdb/apps/Makefile.in index db17224706..17a8a5e826 100644 --- a/dcmqrdb/apps/Makefile.in +++ b/dcmqrdb/apps/Makefile.in @@ -17,6 +17,11 @@ ofstdinc = -I$(ofstddir)/include ofstdlibdir = -L$(ofstddir)/libsrc ofstdlib = -lofstd +oficonvdir = $(top_srcdir)/../oficonv +oficonvinc = -I$(oficonvdir)/include +oficonvlibdir = -L$(oficonvdir)/libsrc +oficonvlib = -loficonv + oflogdir = $(top_srcdir)/../oflog ofloginc = -I$(oflogdir)/include ofloglibdir = -L$(oflogdir)/libsrc @@ -34,8 +39,8 @@ dcmnetlib = -ldcmnet LOCALINCLUDES = $(dcmnetinc) $(dcmdatainc) $(ofstdinc) $(ofloginc) LIBDIRS = -L$(top_srcdir)/libsrc $(dcmnetlibdir) $(dcmdatalibdir) \ - $(ofstdlibdir) $(ofloglibdir) -LOCALLIBS = -ldcmqrdb $(dcmnetlib) $(dcmdatalib) $(ofstdlib) $(ofloglib) \ + $(ofstdlibdir) $(ofloglibdir) $(oficonvlibdir) +LOCALLIBS = -ldcmqrdb $(dcmnetlib) $(dcmdatalib) $(ofstdlib) $(oficonvlib) $(ofloglib) \ $(ZLIBLIBS) $(TCPWRAPPERLIBS) $(CHARCONVLIBS) $(MATHLIBS) objs = dcmqrscp.o dcmqrti.o dcmqridx.o diff --git a/dcmrt/apps/Makefile.in b/dcmrt/apps/Makefile.in index eee9bb4f3d..df126fb1c8 100644 --- a/dcmrt/apps/Makefile.in +++ b/dcmrt/apps/Makefile.in @@ -16,11 +16,12 @@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmimgledir = $(top_srcdir)/../dcmimgle +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(dcmdatadir)/include -I$(oflogdir)/include -I$(ofstddir)/include LIBDIRS = -L$(top_srcdir)/libsrc -L$(dcmimgledir)/libsrc -L$(dcmdatadir)/libsrc \ - -L$(oflogdir)/libsrc -L$(ofstddir)/libsrc -LOCALLIBS = -ldcmrt -ldcmimgle -ldcmdata -loflog -lofstd \ + -L$(oflogdir)/libsrc -L$(ofstddir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmrt -ldcmimgle -ldcmdata -loflog -lofstd -loficonv \ $(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) objs = drtdump.o diff --git a/dcmrt/tests/Makefile.in b/dcmrt/tests/Makefile.in index fc20797e01..0d04c17795 100644 --- a/dcmrt/tests/Makefile.in +++ b/dcmrt/tests/Makefile.in @@ -16,11 +16,12 @@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmimgledir = $(top_srcdir)/../dcmimgle +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(dcmdatadir)/include -I$(oflogdir)/include -I$(ofstddir)/include LIBDIRS = -L$(top_srcdir)/libsrc -L$(dcmimgledir)/libsrc -L$(dcmdatadir)/libsrc \ - -L$(oflogdir)/libsrc -L$(ofstddir)/libsrc -LOCALLIBS = -ldcmrt -ldcmimgle -ldcmdata -loflog -lofstd \ + -L$(oflogdir)/libsrc -L$(ofstddir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmrt -ldcmimgle -ldcmdata -loflog -lofstd -loficonv \ $(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) test_objs = tests.o tsearch.o tcontour.o diff --git a/dcmseg/tests/Makefile.in b/dcmseg/tests/Makefile.in index ff5eec18b4..d0221bc152 100644 --- a/dcmseg/tests/Makefile.in +++ b/dcmseg/tests/Makefile.in @@ -17,10 +17,11 @@ oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmioddir = $(top_srcdir)/../dcmiod dcmfgdir = $(top_srcdir)/../dcmfg +oficonvdir = $(top_srcdir)/../oficonv LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc \ - -L$(dcmdatadir)/libsrc -L$(dcmioddir)/libsrc -L$(dcmfgdir)/libsrc -LOCALLIBS = -ldcmseg -ldcmfg -ldcmiod -ldcmdata -loflog -lofstd $(ZLIBLIBS) \ + -L$(dcmdatadir)/libsrc -L$(dcmioddir)/libsrc -L$(dcmfgdir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmseg -ldcmfg -ldcmiod -ldcmdata -loflog -lofstd -loficonv $(ZLIBLIBS) \ $(CHARCONVLIBS) $(MATHLIBS) LOCALINCLUDES = -I$(top_srcdir)/include -I$(ofstddir)/include -I$(oflogdir)/include \ -I$(dcmdatadir)/include -I$(dcmioddir)/include -I$(dcmfgdir)/include \ diff --git a/dcmsign/apps/Makefile.in b/dcmsign/apps/Makefile.in index 9ef70f50c8..09e103307e 100644 --- a/dcmsign/apps/Makefile.in +++ b/dcmsign/apps/Makefile.in @@ -15,11 +15,12 @@ include $(configdir)/@common_makefile@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc \ - -L$(dcmdatadir)/libsrc -LOCALLIBS = -ldcmdsig -ldcmdata -loflog -lofstd $(ZLIBLIBS) $(OPENSSLLIBS) \ + -L$(dcmdatadir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmdsig -ldcmdata -loflog -lofstd -loficonv $(ZLIBLIBS) $(OPENSSLLIBS) \ $(CHARCONVLIBS) $(MATHLIBS) objs = dcmsign.o diff --git a/dcmsr/apps/Makefile.in b/dcmsr/apps/Makefile.in index 2ca2bbb8f1..a70707d55a 100644 --- a/dcmsr/apps/Makefile.in +++ b/dcmsr/apps/Makefile.in @@ -17,12 +17,14 @@ oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmimgledir = $(top_srcdir)/../dcmimgle dcmimagedir = $(top_srcdir)/../dcmimage +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include \ -I$(dcmimgledir)/include -I$(dcmimagedir)/include LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc \ - -L$(dcmdatadir)/libsrc -L$(dcmimgledir)/libsrc -L$(dcmimagedir)/libsrc -LOCALLIBS = -ldcmsr -ldcmimage -ldcmimgle -ldcmdata -loflog -lofstd $(TIFFLIBS) \ + -L$(dcmdatadir)/libsrc -L$(dcmimgledir)/libsrc -L$(dcmimagedir)/libsrc \ + -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmsr -ldcmimage -ldcmimgle -ldcmdata -loflog -lofstd -loficonv $(TIFFLIBS) \ $(PNGLIBS) $(XMLLIBS) $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) objs = dsrdump.o dsr2html.o dsr2xml.o xml2dsr.o diff --git a/dcmsr/tests/Makefile.in b/dcmsr/tests/Makefile.in index fad35c59e5..5bac706b68 100644 --- a/dcmsr/tests/Makefile.in +++ b/dcmsr/tests/Makefile.in @@ -17,13 +17,14 @@ oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmimgledir = $(top_srcdir)/../dcmimgle dcmimagedir = $(top_srcdir)/../dcmimage +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include \ -I$(dcmimgledir)/include -I$(dcmimagedir)/include LIBDIRS = -L$(top_srcdir)/libcmr -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc \ -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmimgledir)/libsrc \ - -L$(dcmimagedir)/libsrc -LOCALLIBS = -lcmr -ldcmsr -ldcmimage -ldcmimgle -ldcmdata -loflog -lofstd $(TIFFLIBS) \ + -L$(dcmimagedir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -lcmr -ldcmsr -ldcmimage -ldcmimgle -ldcmdata -loflog -lofstd -loficonv $(TIFFLIBS) \ $(PNGLIBS) $(XMLLIBS) $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) tstobjs = tests.o tsrtree.o tsrdoctr.o tsrdoc.o tsrcodvl.o tsrnumvl.o tsrtpl.o tsrcmr.o \ diff --git a/dcmwlm/apps/Makefile.in b/dcmwlm/apps/Makefile.in index 880a48d2b0..3899a7e46c 100644 --- a/dcmwlm/apps/Makefile.in +++ b/dcmwlm/apps/Makefile.in @@ -17,6 +17,11 @@ ofstdinc = -I$(ofstddir)/include ofstdlibdir = -L$(ofstddir)/libsrc ofstdlib = -lofstd +oficonvdir = $(top_srcdir)/../oficonv +oficonvinc = -I$(oficonvdir)/include +oficonvlibdir = -L$(oficonvdir)/libsrc +oficonvlib = -loficonv + oflogdir = $(top_srcdir)/../oflog ofloginc = -I$(oflogdir)/include ofloglibdir = -L$(oflogdir)/libsrc @@ -34,8 +39,8 @@ dcmnetlib = -ldcmnet LOCALINCLUDES = $(dcmnetinc) $(dcmdatainc) $(ofloginc) $(ofstdinc) LIBDIRS = -L$(top_srcdir)/libsrc $(dcmnetlibdir) $(dcmdatalibdir) \ - $(ofloglibdir) $(ofstdlibdir) -LOCALLIBS = -ldcmwlm $(dcmnetlib) $(dcmdatalib) $(ofloglib) $(ofstdlib) \ + $(ofloglibdir) $(ofstdlibdir) $(oficonvlibdir) +LOCALLIBS = -ldcmwlm $(dcmnetlib) $(dcmdatalib) $(ofloglib) $(ofstdlib) $(oficonvlib) \ $(ZLIBLIBS) $(TCPWRAPPERLIBS) $(CHARCONVLIBS) $(MATHLIBS) objs = wlcefs.o wlmscpfs.o diff --git a/dcmwlm/tests/Makefile.in b/dcmwlm/tests/Makefile.in index 2ba9569881..8d03c19aa9 100644 --- a/dcmwlm/tests/Makefile.in +++ b/dcmwlm/tests/Makefile.in @@ -16,12 +16,13 @@ ofstddir = $(top_srcdir)/../ofstd oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmnetdir = $(top_srcdir)/../dcmnet +oficonvdir = $(top_srcdir)/../oficonv LOCALINCLUDES = -I$(dcmnetdir)/include -I$(dcmdatadir)/include \ -I$(oflogdir)/include -I$(ofstddir)/include LIBDIRS = -L$(top_srcdir)/libsrc -L$(dcmnetdir)/libsrc -L$(dcmdatadir)/libsrc \ - -L$(oflogdir)/libsrc -L$(ofstddir)/libsrc -LOCALLIBS = -ldcmwlm -ldcmnet -ldcmdata -loflog -lofstd $(ZLIBLIBS) \ + -L$(oflogdir)/libsrc -L$(ofstddir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -ldcmwlm -ldcmnet -ldcmdata -loflog -lofstd -loficonv $(ZLIBLIBS) \ $(TCPWRAPPERLIBS) $(CHARCONVLIBS) $(MATHLIBS) objs = wltest.o diff --git a/oficonv/Makefile.in b/oficonv/Makefile.in new file mode 100644 index 0000000000..dc8cdbfd41 --- /dev/null +++ b/oficonv/Makefile.in @@ -0,0 +1,87 @@ +# +# Makefile for oficonv +# + +@SET_MAKE@ + +SHELL = /bin/sh +VPATH = @srcdir@:@top_srcdir@/include:@top_srcdir@/@configdir@/include +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +configdir = @top_srcdir@/@configdir@ + +include $(configdir)/@common_makefile@ + + +all: include-all libsrc-all apps-all tests-all + +install: install-bin install-doc install-support + +install-bin: apps-install + +install-doc: docs-install + +install-data: data-install + +install-include: include-install + +install-lib: libsrc-install install-include + +install-support: install-data + + +include-all: + (cd include && $(MAKE) ARCH="$(ARCH)" all) + +libsrc-all: include-all + (cd libsrc && $(MAKE) ARCH="$(ARCH)" all) + +apps-all: libsrc-all + (cd apps && $(MAKE) ARCH="$(ARCH)" all) + +tests-all: libsrc-all + (cd tests && $(MAKE) ARCH="$(ARCH)" all) + +check: tests-all + (cd tests && $(MAKE) check) + +check-exhaustive: tests-all + (cd tests && $(MAKE) check-exhaustive) + +include-install: + (cd include && $(MAKE) ARCH="$(ARCH)" install) + +libsrc-install: libsrc-all + (cd libsrc && $(MAKE) ARCH="$(ARCH)" install-lib) + +apps-install: apps-all + (cd apps && $(MAKE) ARCH="$(ARCH)" install) + +docs-install: + (cd docs && $(MAKE) install) + +data-install: + (cd data && $(MAKE) install) + +clean: + (cd include && $(MAKE) clean) + (cd libsrc && $(MAKE) clean) + (cd apps && $(MAKE) clean) + (cd tests && $(MAKE) clean) + (cd docs && $(MAKE) clean) + (cd data && $(MAKE) clean) + rm -f $(TRASH) + +distclean: + (cd include && $(MAKE) distclean) + (cd libsrc && $(MAKE) distclean) + (cd apps && $(MAKE) distclean) + (cd tests && $(MAKE) distclean) + (cd docs && $(MAKE) distclean) + (cd data && $(MAKE) distclean) + rm -f $(DISTTRASH) + +dependencies: + (cd libsrc && touch $(DEP) && $(MAKE) dependencies) + (cd apps && touch $(DEP) && $(MAKE) dependencies) + (cd tests && touch $(DEP) && $(MAKE) dependencies) diff --git a/oficonv/apps/Makefile.dep b/oficonv/apps/Makefile.dep new file mode 100644 index 0000000000..6c2e28dbdb --- /dev/null +++ b/oficonv/apps/Makefile.dep @@ -0,0 +1,24 @@ +mkcsmapper_bison.o: mkcsmapper_bison.cc \ + ../../config/include/dcmtk/config/osconfig.h mkcsmapper_ldef.h \ + ../libsrc/citrus_types.h ../libsrc/citrus_mapper_std_file.h \ + ../libsrc/citrus_bcs.h ../libsrc/citrus_region.h \ + ../libsrc/citrus_db_factory.h ../include/dcmtk/oficonv/oidefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h ../libsrc/citrus_db_hash.h \ + ../libsrc/citrus_lookup_factory.h ../libsrc/citrus_pivot_factory.h \ + mkcsmapper_bison.h +mkcsmapper_flex.o: mkcsmapper_flex.cc \ + ../../config/include/dcmtk/config/osconfig.h mkcsmapper_ldef.h \ + ../libsrc/citrus_bcs.h ../libsrc/oficonv_strlcpy.h \ + ../include/dcmtk/oficonv/oidefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h mkcsmapper_bison.h +mkesdb_bison.o: mkesdb_bison.cc \ + ../../config/include/dcmtk/config/osconfig.h ../libsrc/citrus_types.h \ + ../libsrc/citrus_region.h ../libsrc/citrus_esdb_file.h \ + ../libsrc/citrus_db_hash.h ../include/dcmtk/oficonv/oidefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h ../libsrc/citrus_db_factory.h \ + ../libsrc/citrus_lookup_factory.h mkesdb_ldef.h mkesdb_bison.h +mkesdb_flex.o: mkesdb_flex.cc \ + ../../config/include/dcmtk/config/osconfig.h mkesdb_ldef.h \ + mkesdb_bison.h ../libsrc/oficonv_strlcpy.h \ + ../include/dcmtk/oficonv/oidefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h diff --git a/oficonv/apps/Makefile.in b/oficonv/apps/Makefile.in new file mode 100644 index 0000000000..7063f98303 --- /dev/null +++ b/oficonv/apps/Makefile.in @@ -0,0 +1,60 @@ +# +# Makefile for oficonv/apps +# + +@SET_MAKE@ + +SHELL = /bin/sh +VPATH = @srcdir@:@top_srcdir@/include:@top_srcdir@/@configdir@/include +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +configdir = @top_srcdir@/@configdir@ + +include $(configdir)/@common_makefile@ + +ofstddir = $(top_srcdir)/../ofstd + +LOCALINCLUDES = -I$(ofstddir)/include -I$(top_srcdir)/libsrc +LIBDIRS = -L$(top_srcdir)/libsrc +LOCALLIBS = -loficonv + +objs = mkcsmapper_bison.o mkcsmapper_flex.o mkesdb_bison.o mkesdb_flex.o + +progs = mkcsmapper mkesdb + +all: $(progs) + +mkcsmapper: mkcsmapper_bison.o mkcsmapper_flex.o + $(CXX) $(CXXFLAGS) $(LIBDIRS) $(LDFLAGS) -o $@ mkcsmapper_bison.o mkcsmapper_flex.o $(LOCALLIBS) $(LIBS) + +mkesdb: mkesdb_bison.o mkesdb_flex.o + $(CXX) $(CXXFLAGS) $(LIBDIRS) $(LDFLAGS) -o $@ mkesdb_bison.o mkesdb_flex.o $(LOCALLIBS) $(LIBS) + +# special make target "run_flex_and_bison". This re-builds the source code +# for mkcsmapper and mkesdb from the flex and bison rule files. + +run_flex_and_bison: + flex --outfile=$(top_srcdir)/apps/mkcsmapper_flex.cc mkcsmapper.l + flex --outfile=$(top_srcdir)/apps/mkesdb_flex.cc mkesdb.l + bison --defines=$(top_srcdir)/apps/mkcsmapper_bison.h --output=$(top_srcdir)/apps/mkcsmapper_bison.cc mkcsmapper.y + bison --defines=$(top_srcdir)/apps/mkesdb_bison.h --output=$(top_srcdir)/apps/mkesdb_bison.cc mkesdb.y + +install: install-bin + +install-bin: all + $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) + for prog in $(progs); do \ + $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ + done + +clean: + rm -f $(objs) $(progs) $(TRASH) + +distclean: + rm -f $(objs) $(progs) $(DISTTRASH) + + +dependencies: + $(CXX) -MM $(defines) $(includes) $(CPPFLAGS) $(CXXFLAGS) *.cc > $(DEP) + +include $(DEP) diff --git a/oficonv/configure b/oficonv/configure new file mode 100755 index 0000000000..396668ee32 --- /dev/null +++ b/oficonv/configure @@ -0,0 +1,56 @@ +#! /bin/sh + +parentdir=`pwd` +thisdir=$parentdir + +# The following test constructs relative path from the module +# directory to the configuration directory. If you know this path +# you can substitute this with +# configdir= +# It is very important that the configdir path is relative. + +configdir="configdir" + +while test "$parentdir" != "/" -a "$configdir" = "configdir"; do + if test -d "$parentdir/config" ; then + configdir=$parentdir/config + else + parentdir=`echo $parentdir | sed 's/\/[^\/]*$//'` + fi +done + +if test "$configdir" = "configdir" ; then + echo "Cannot find configure directory" + exit 1 +fi + +if test $# != 0; then + case $1 in + -a) + shift + cd "$configdir" + echo "running configure in config-directory" + ./configure $* + cd $thisdir + echo "running configure for this module" + sh "$configdir/confmod" --srcdir=. $* + ;; + -c) + shift + cd "$configdir" + echo "running configure in config-directory" + ./configure $* + ;; + *) + echo "running configure for this module" + sh "$configdir/confmod" --srcdir=. $* + ;; + esac +else + echo "running configure for this module" + sh "$configdir/confmod" --srcdir=. $* +fi + + + + diff --git a/oficonv/data/Makefile.dep b/oficonv/data/Makefile.dep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/oficonv/data/Makefile.in b/oficonv/data/Makefile.in new file mode 100644 index 0000000000..7822cc957f --- /dev/null +++ b/oficonv/data/Makefile.in @@ -0,0 +1,169 @@ +# +# Makefile for oficonv/data +# + +@SET_MAKE@ + +SHELL = /bin/sh +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +configdir = @top_srcdir@/@configdir@ + +include $(configdir)/@common_makefile@ + +all: + +install: + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/csmapper + for file in csmapper/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/csmapper ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/csmapper/CP + for file in csmapper/CP/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/csmapper/CP ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/csmapper/GB + for file in csmapper/GB/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/csmapper/GB ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/csmapper/ISO646 + for file in csmapper/ISO646/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/csmapper/ISO646 ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/csmapper/ISO-8859 + for file in csmapper/ISO-8859/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/csmapper/ISO-8859 ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/csmapper/JIS + for file in csmapper/JIS/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/csmapper/JIS ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/csmapper/KS + for file in csmapper/KS/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/csmapper/KS ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/esdb + for file in esdb/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/esdb ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/esdb/EUC + for file in esdb/EUC/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/esdb/EUC ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/esdb/GB + for file in esdb/GB/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/esdb/GB ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/esdb/ISO646 + for file in esdb/ISO646/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/esdb/ISO646 ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/esdb/ISO-8859 + for file in esdb/ISO-8859/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/esdb/ISO-8859 ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/esdb/MISC + for file in esdb/MISC/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/esdb/MISC ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(datadir)/esdb/UTF + for file in esdb/UTF/*.* ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/esdb/UTF ;\ + done + +# special make target "oficonv_data_library". +# Rebuild the header files for the built-in oficonv data library from the binary +# mps and esdb files. + +oficonv_data_library: + xxd -i "csmapper/mapper.dir.db" "${oficonv_SOURCE_DIR}/libsrc/csmapper_mapper_dir_db.h" + xxd -i "csmapper/ISO-8859/UCS%ISO-8859-9.mps" "../libsrc/csmapper_iso_8859_ucs_iso_8859_9_mps.h" + xxd -i "csmapper/ISO-8859/ISO-8859-8%UCS.mps" "../libsrc/csmapper_iso_8859_iso_8859_8_ucs_mps.h" + xxd -i "csmapper/ISO-8859/UCS%ISO-8859-3.mps" "../libsrc/csmapper_iso_8859_ucs_iso_8859_3_mps.h" + xxd -i "csmapper/ISO-8859/ISO-8859-5%UCS.mps" "../libsrc/csmapper_iso_8859_iso_8859_5_ucs_mps.h" + xxd -i "csmapper/ISO-8859/UCS%ISO-8859-5.mps" "../libsrc/csmapper_iso_8859_ucs_iso_8859_5_mps.h" + xxd -i "csmapper/ISO-8859/ISO-8859-11%UCS.mps" "../libsrc/csmapper_iso_8859_iso_8859_11_ucs_mps.h" + xxd -i "csmapper/ISO-8859/ISO-8859-9%UCS.mps" "../libsrc/csmapper_iso_8859_iso_8859_9_ucs_mps.h" + xxd -i "csmapper/ISO-8859/ISO-8859-4%UCS.mps" "../libsrc/csmapper_iso_8859_iso_8859_4_ucs_mps.h" + xxd -i "csmapper/ISO-8859/ISO-8859-7%UCS.mps" "../libsrc/csmapper_iso_8859_iso_8859_7_ucs_mps.h" + xxd -i "csmapper/ISO-8859/UCS%ISO-8859-6.mps" "../libsrc/csmapper_iso_8859_ucs_iso_8859_6_mps.h" + xxd -i "csmapper/ISO-8859/ISO-8859-6%UCS.mps" "../libsrc/csmapper_iso_8859_iso_8859_6_ucs_mps.h" + xxd -i "csmapper/ISO-8859/UCS%ISO-8859-15.mps" "../libsrc/csmapper_iso_8859_ucs_iso_8859_15_mps.h" + xxd -i "csmapper/ISO-8859/ISO-8859-3%UCS.mps" "../libsrc/csmapper_iso_8859_iso_8859_3_ucs_mps.h" + xxd -i "csmapper/ISO-8859/UCS%ISO-8859-11.mps" "../libsrc/csmapper_iso_8859_ucs_iso_8859_11_mps.h" + xxd -i "csmapper/ISO-8859/ISO-8859-15%UCS.mps" "../libsrc/csmapper_iso_8859_iso_8859_15_ucs_mps.h" + xxd -i "csmapper/ISO-8859/UCS%ISO-8859-2.mps" "../libsrc/csmapper_iso_8859_ucs_iso_8859_2_mps.h" + xxd -i "csmapper/ISO-8859/UCS%ISO-8859-8.mps" "../libsrc/csmapper_iso_8859_ucs_iso_8859_8_mps.h" + xxd -i "csmapper/ISO-8859/UCS%ISO-8859-4.mps" "../libsrc/csmapper_iso_8859_ucs_iso_8859_4_mps.h" + xxd -i "csmapper/ISO-8859/UCS%ISO-8859-7.mps" "../libsrc/csmapper_iso_8859_ucs_iso_8859_7_mps.h" + xxd -i "csmapper/ISO-8859/ISO-8859-2%UCS.mps" "../libsrc/csmapper_iso_8859_iso_8859_2_ucs_mps.h" + xxd -i "csmapper/CP/UCS%CP936EXT.mps" "../libsrc/csmapper_cp_ucs_cp936ext_mps.h" + xxd -i "csmapper/CP/CP936EXT%UCS.mps" "../libsrc/csmapper_cp_cp936ext_ucs_mps.h" + xxd -i "csmapper/mapper.dir" "../libsrc/csmapper_mapper_dir.h" + xxd -i "csmapper/ISO646/ISO646-JP%UCS.646" "../libsrc/csmapper_iso646_iso646_jp_ucs_646.h" + xxd -i "csmapper/ISO646/ISO646-US%UCS.646" "../libsrc/csmapper_iso646_iso646_us_ucs_646.h" + xxd -i "csmapper/JIS/JISX0212%UCS.mps" "../libsrc/csmapper_jis_jisx0212_ucs_mps.h" + xxd -i "csmapper/JIS/UCS%JISX0208@1990.mps" "../libsrc/csmapper_jis_ucs_jisx0208@1990_mps.h" + xxd -i "csmapper/JIS/UCS%JISX0201-KANA.mps" "../libsrc/csmapper_jis_ucs_jisx0201_kana_mps.h" + xxd -i "csmapper/JIS/JISX0208@1990%UCS.mps" "../libsrc/csmapper_jis_jisx0208@1990_ucs_mps.h" + xxd -i "csmapper/JIS/JISX0201-KANA%UCS.mps" "../libsrc/csmapper_jis_jisx0201_kana_ucs_mps.h" + xxd -i "csmapper/JIS/UCS%JISX0212.mps" "../libsrc/csmapper_jis_ucs_jisx0212_mps.h" + xxd -i "csmapper/charset.pivot.pvdb" "../libsrc/csmapper_charset_pivot_pvdb.h" + xxd -i "csmapper/GB/GBKUDA%UCS.mps" "../libsrc/csmapper_gb_gbkuda_ucs_mps.h" + xxd -i "csmapper/GB/GB2312EXT%UCS.mps" "../libsrc/csmapper_gb_gb2312ext_ucs_mps.h" + xxd -i "csmapper/GB/UCS%GB2312.mps" "../libsrc/csmapper_gb_ucs_gb2312_mps.h" + xxd -i "csmapper/GB/GB2312%UCS.mps" "../libsrc/csmapper_gb_gb2312_ucs_mps.h" + xxd -i "csmapper/GB/GB2312UDA1%UCS.mps" "../libsrc/csmapper_gb_gb2312uda1_ucs_mps.h" + xxd -i "csmapper/GB/UCS@BMP%GB18030.mps" "../libsrc/csmapper_gb_ucs@bmp_gb18030_mps.h" + xxd -i "csmapper/GB/UCS%GBKEXT.mps" "../libsrc/csmapper_gb_ucs_gbkext_mps.h" + xxd -i "csmapper/GB/UCS%GB2312UDA1.mps" "../libsrc/csmapper_gb_ucs_gb2312uda1_mps.h" + xxd -i "csmapper/GB/GB2312UDA2%UCS.mps" "../libsrc/csmapper_gb_gb2312uda2_ucs_mps.h" + xxd -i "csmapper/GB/UCS%GB2312EXT.mps" "../libsrc/csmapper_gb_ucs_gb2312ext_mps.h" + xxd -i "csmapper/GB/GB2312GBK%UCS.mps" "../libsrc/csmapper_gb_gb2312gbk_ucs_mps.h" + xxd -i "csmapper/GB/UCS%GBKUDA.mps" "../libsrc/csmapper_gb_ucs_gbkuda_mps.h" + xxd -i "csmapper/GB/GB18030%UCS@BMP.mps" "../libsrc/csmapper_gb_gb18030_ucs@bmp_mps.h" + xxd -i "csmapper/GB/GBKEXT%UCS.mps" "../libsrc/csmapper_gb_gbkext_ucs_mps.h" + xxd -i "csmapper/GB/UCS%GB2312UDA2.mps" "../libsrc/csmapper_gb_ucs_gb2312uda2_mps.h" + xxd -i "csmapper/KS/KSC5601HANGUL%UCS.mps" "../libsrc/csmapper_ks_ksc5601hangul_ucs_mps.h" + xxd -i "csmapper/KS/UCS%KSC5601HANJA.mps" "../libsrc/csmapper_ks_ucs_ksc5601hanja_mps.h" + xxd -i "csmapper/KS/KSC5601HANJA%UCS.mps" "../libsrc/csmapper_ks_ksc5601hanja_ucs_mps.h" + xxd -i "csmapper/KS/UCS%KSC5601HANGUL.mps" "../libsrc/csmapper_ks_ucs_ksc5601hangul_mps.h" + xxd -i "esdb/EUC/EUC-KR.esdb" "../libsrc/esdb_euc_euc_kr_esdb.h" + xxd -i "esdb/EUC/EUC-CN.esdb" "../libsrc/esdb_euc_euc_cn_esdb.h" + xxd -i "esdb/ISO-8859/ISO-8859-8.esdb" "../libsrc/esdb_iso_8859_iso_8859_8_esdb.h" + xxd -i "esdb/ISO-8859/ISO-8859-4.esdb" "../libsrc/esdb_iso_8859_iso_8859_4_esdb.h" + xxd -i "esdb/ISO-8859/ISO-8859-11.esdb" "../libsrc/esdb_iso_8859_iso_8859_11_esdb.h" + xxd -i "esdb/ISO-8859/ISO-8859-3.esdb" "../libsrc/esdb_iso_8859_iso_8859_3_esdb.h" + xxd -i "esdb/ISO-8859/ISO-8859-15.esdb" "../libsrc/esdb_iso_8859_iso_8859_15_esdb.h" + xxd -i "esdb/ISO-8859/ISO-8859-5.esdb" "../libsrc/esdb_iso_8859_iso_8859_5_esdb.h" + xxd -i "esdb/ISO-8859/ISO-8859-6.esdb" "../libsrc/esdb_iso_8859_iso_8859_6_esdb.h" + xxd -i "esdb/ISO-8859/ISO-8859-2.esdb" "../libsrc/esdb_iso_8859_iso_8859_2_esdb.h" + xxd -i "esdb/ISO-8859/ISO-8859-9.esdb" "../libsrc/esdb_iso_8859_iso_8859_9_esdb.h" + xxd -i "esdb/ISO-8859/ISO-8859-1.esdb" "../libsrc/esdb_iso_8859_iso_8859_1_esdb.h" + xxd -i "esdb/ISO-8859/ISO-8859-7.esdb" "../libsrc/esdb_iso_8859_iso_8859_7_esdb.h" + xxd -i "esdb/MISC/JISX0208@1990.esdb" "../libsrc/esdb_misc_jisx0208@1990_esdb.h" + xxd -i "esdb/MISC/JISX0212.esdb" "../libsrc/esdb_misc_jisx0212_esdb.h" + xxd -i "esdb/MISC/Shift_JIS.esdb" "../libsrc/esdb_misc_shift_jis_esdb.h" + xxd -i "esdb/MISC/JISX0201-KANA.esdb" "../libsrc/esdb_misc_jisx0201_kana_esdb.h" + xxd -i "esdb/esdb.alias.db" "../libsrc/esdb_esdb_alias_db.h" + xxd -i "esdb/UTF/UTF-16-INTERNAL.esdb" "../libsrc/esdb_utf_utf_16_internal_esdb.h" + xxd -i "esdb/UTF/UTF-16BE.esdb" "../libsrc/esdb_utf_utf_16be_esdb.h" + xxd -i "esdb/UTF/UTF-16.esdb" "../libsrc/esdb_utf_utf_16_esdb.h" + xxd -i "esdb/UTF/UTF-32-SWAPPED.esdb" "../libsrc/esdb_utf_utf_32_swapped_esdb.h" + xxd -i "esdb/UTF/UTF-32-INTERNAL.esdb" "../libsrc/esdb_utf_utf_32_internal_esdb.h" + xxd -i "esdb/UTF/UTF-32LE.esdb" "../libsrc/esdb_utf_utf_32le_esdb.h" + xxd -i "esdb/UTF/UTF-16-SWAPPED.esdb" "../libsrc/esdb_utf_utf_16_swapped_esdb.h" + xxd -i "esdb/UTF/UTF-8.esdb" "../libsrc/esdb_utf_utf_8_esdb.h" + xxd -i "esdb/UTF/UTF-32BE.esdb" "../libsrc/esdb_utf_utf_32be_esdb.h" + xxd -i "esdb/UTF/UTF-16LE.esdb" "../libsrc/esdb_utf_utf_16le_esdb.h" + xxd -i "esdb/UTF/UTF-32.esdb" "../libsrc/esdb_utf_utf_32_esdb.h" + xxd -i "esdb/ISO646/ISO646-US.esdb" "../libsrc/esdb_iso646_iso646_us_esdb.h" + xxd -i "esdb/esdb.dir.db" "../libsrc/esdb_esdb_dir_db.h" + xxd -i "esdb/GB/GB18030.esdb" "../libsrc/esdb_gb_gb18030_esdb.h" + xxd -i "esdb/GB/GBK.esdb" "../libsrc/esdb_gb_gbk_esdb.h" + +clean: + rm -f $(TRASH) + +distclean: + rm -f $(DISTTRASH) diff --git a/oficonv/datasrc/Makefile.in b/oficonv/datasrc/Makefile.in new file mode 100644 index 0000000000..8ccf42c99e --- /dev/null +++ b/oficonv/datasrc/Makefile.in @@ -0,0 +1,153 @@ +# +# Makefile for oficonv/datasrc +# + +@SET_MAKE@ + +SHELL = /bin/sh +VPATH = @srcdir@:@top_srcdir@/include:@top_srcdir@/@configdir@/include +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +configdir = @top_srcdir@/@configdir@ +include $(configdir)/@common_makefile@ + +# special make target "oficonv_data_files". +# This compiles the binary oficonv data files from the source files +# in the datasrc directory. + +oficonv_data_files: + mkcsmapper -o "../data/csmapper/CP/CP936EXT%UCS.mps" "csmapper/CP/CP936EXT%UCS.src" + mkcsmapper -o "../data/csmapper/CP/UCS%CP936EXT.mps" "csmapper/CP/UCS%CP936EXT.src" + mkcsmapper -o "../data/csmapper/GB/GB18030%UCS@BMP.mps" "csmapper/GB/GB18030%UCS@BMP.src" + mkcsmapper -o "../data/csmapper/GB/GB2312%UCS.mps" "csmapper/GB/GB2312%UCS.src" + mkcsmapper -o "../data/csmapper/GB/GB2312EXT%UCS.mps" "csmapper/GB/GB2312EXT%UCS.src" + mkcsmapper -o "../data/csmapper/GB/GB2312GBK%UCS.mps" "csmapper/GB/GB2312GBK%UCS.src" + mkcsmapper -o "../data/csmapper/GB/GB2312UDA1%UCS.mps" "csmapper/GB/GB2312UDA1%UCS.src" + mkcsmapper -o "../data/csmapper/GB/GB2312UDA2%UCS.mps" "csmapper/GB/GB2312UDA2%UCS.src" + mkcsmapper -o "../data/csmapper/GB/GBKEXT%UCS.mps" "csmapper/GB/GBKEXT%UCS.src" + mkcsmapper -o "../data/csmapper/GB/GBKUDA%UCS.mps" "csmapper/GB/GBKUDA%UCS.src" + mkcsmapper -o "../data/csmapper/GB/UCS%GB2312.mps" "csmapper/GB/UCS%GB2312.src" + mkcsmapper -o "../data/csmapper/GB/UCS%GB2312EXT.mps" "csmapper/GB/UCS%GB2312EXT.src" + mkcsmapper -o "../data/csmapper/GB/UCS%GB2312UDA1.mps" "csmapper/GB/UCS%GB2312UDA1.src" + mkcsmapper -o "../data/csmapper/GB/UCS%GB2312UDA2.mps" "csmapper/GB/UCS%GB2312UDA2.src" + mkcsmapper -o "../data/csmapper/GB/UCS%GBKEXT.mps" "csmapper/GB/UCS%GBKEXT.src" + mkcsmapper -o "../data/csmapper/GB/UCS%GBKUDA.mps" "csmapper/GB/UCS%GBKUDA.src" + mkcsmapper -o "../data/csmapper/GB/UCS@BMP%GB18030.mps" "csmapper/GB/UCS@BMP%GB18030.src" + mkcsmapper -o "../data/csmapper/ISO-8859/ISO-8859-2%UCS.mps" "csmapper/ISO-8859/ISO-8859-2%UCS.src" + mkcsmapper -o "../data/csmapper/ISO-8859/ISO-8859-3%UCS.mps" "csmapper/ISO-8859/ISO-8859-3%UCS.src" + mkcsmapper -o "../data/csmapper/ISO-8859/ISO-8859-4%UCS.mps" "csmapper/ISO-8859/ISO-8859-4%UCS.src" + mkcsmapper -o "../data/csmapper/ISO-8859/ISO-8859-5%UCS.mps" "csmapper/ISO-8859/ISO-8859-5%UCS.src" + mkcsmapper -o "../data/csmapper/ISO-8859/ISO-8859-6%UCS.mps" "csmapper/ISO-8859/ISO-8859-6%UCS.src" + mkcsmapper -o "../data/csmapper/ISO-8859/ISO-8859-7%UCS.mps" "csmapper/ISO-8859/ISO-8859-7%UCS.src" + mkcsmapper -o "../data/csmapper/ISO-8859/ISO-8859-8%UCS.mps" "csmapper/ISO-8859/ISO-8859-8%UCS.src" + mkcsmapper -o "../data/csmapper/ISO-8859/ISO-8859-9%UCS.mps" "csmapper/ISO-8859/ISO-8859-9%UCS.src" + mkcsmapper -o "../data/csmapper/ISO-8859/ISO-8859-11%UCS.mps" "csmapper/ISO-8859/ISO-8859-11%UCS.src" + mkcsmapper -o "../data/csmapper/ISO-8859/ISO-8859-15%UCS.mps" "csmapper/ISO-8859/ISO-8859-15%UCS.src" + mkcsmapper -o "../data/csmapper/ISO-8859/UCS%ISO-8859-2.mps" "csmapper/ISO-8859/UCS%ISO-8859-2.src" + mkcsmapper -o "../data/csmapper/ISO-8859/UCS%ISO-8859-3.mps" "csmapper/ISO-8859/UCS%ISO-8859-3.src" + mkcsmapper -o "../data/csmapper/ISO-8859/UCS%ISO-8859-4.mps" "csmapper/ISO-8859/UCS%ISO-8859-4.src" + mkcsmapper -o "../data/csmapper/ISO-8859/UCS%ISO-8859-5.mps" "csmapper/ISO-8859/UCS%ISO-8859-5.src" + mkcsmapper -o "../data/csmapper/ISO-8859/UCS%ISO-8859-6.mps" "csmapper/ISO-8859/UCS%ISO-8859-6.src" + mkcsmapper -o "../data/csmapper/ISO-8859/UCS%ISO-8859-7.mps" "csmapper/ISO-8859/UCS%ISO-8859-7.src" + mkcsmapper -o "../data/csmapper/ISO-8859/UCS%ISO-8859-8.mps" "csmapper/ISO-8859/UCS%ISO-8859-8.src" + mkcsmapper -o "../data/csmapper/ISO-8859/UCS%ISO-8859-9.mps" "csmapper/ISO-8859/UCS%ISO-8859-9.src" + mkcsmapper -o "../data/csmapper/ISO-8859/UCS%ISO-8859-11.mps" "csmapper/ISO-8859/UCS%ISO-8859-11.src" + mkcsmapper -o "../data/csmapper/ISO-8859/UCS%ISO-8859-15.mps" "csmapper/ISO-8859/UCS%ISO-8859-15.src" + mkcsmapper -o "../data/csmapper/JIS/JISX0201-KANA%UCS.mps" "csmapper/JIS/JISX0201-KANA%UCS.src" + mkcsmapper -o "../data/csmapper/JIS/JISX0208@1990%UCS.mps" "csmapper/JIS/JISX0208@1990%UCS.src" + mkcsmapper -o "../data/csmapper/JIS/JISX0212%UCS.mps" "csmapper/JIS/JISX0212%UCS.src" + mkcsmapper -o "../data/csmapper/JIS/UCS%JISX0201-KANA.mps" "csmapper/JIS/UCS%JISX0201-KANA.src" + mkcsmapper -o "../data/csmapper/JIS/UCS%JISX0208@1990.mps" "csmapper/JIS/UCS%JISX0208@1990.src" + mkcsmapper -o "../data/csmapper/JIS/UCS%JISX0212.mps" "csmapper/JIS/UCS%JISX0212.src" + mkcsmapper -o "../data/csmapper/KS/KSC5601HANGUL%UCS.mps" "csmapper/KS/KSC5601HANGUL%UCS.src" + mkcsmapper -o "../data/csmapper/KS/KSC5601HANJA%UCS.mps" "csmapper/KS/KSC5601HANJA%UCS.src" + mkcsmapper -o "../data/csmapper/KS/UCS%KSC5601HANGUL.mps" "csmapper/KS/UCS%KSC5601HANGUL.src" + mkcsmapper -o "../data/csmapper/KS/UCS%KSC5601HANJA.mps" "csmapper/KS/UCS%KSC5601HANJA.src" + cp "csmapper/ISO646/ISO646-JP%UCS.646" "../data/csmapper/ISO646/ISO646-JP%UCS.646" + cp "csmapper/ISO646/ISO646-US%UCS.646" "../data/csmapper/ISO646/ISO646-US%UCS.646" + cp "csmapper/mapper.dir" "../data/csmapper/mapper.dir" + mkcsmapper -m -o "../data/csmapper/mapper.dir.db" "../data/csmapper/mapper.dir" + mkcsmapper -p -o "../data/csmapper/charset.pivot.pvdb" "csmapper/charset.pivot" + mkesdb -o "../data/esdb/EUC/EUC-CN.esdb" "esdb/EUC/EUC-CN.src" + mkesdb -o "../data/esdb/EUC/EUC-KR.esdb" "esdb/EUC/EUC-KR.src" + mkesdb -o "../data/esdb/GB/GB18030.esdb" "esdb/GB/GB18030.src" + mkesdb -o "../data/esdb/GB/GBK.esdb" "esdb/GB/GBK.src" + cmake -DINFILE="esdb/ISO-8859/ISO-8859.src" -DOUTFILE="ISO-8859-1.src" -DREGEX=ISO-8859-x -DREPLACE=ISO-8859-1 -P replace.cmake + cmake -DINFILE="esdb/ISO-8859/ISO-8859.src" -DOUTFILE="ISO-8859-2.src" -DREGEX=ISO-8859-x -DREPLACE=ISO-8859-2 -P replace.cmake + cmake -DINFILE="esdb/ISO-8859/ISO-8859.src" -DOUTFILE="ISO-8859-3.src" -DREGEX=ISO-8859-x -DREPLACE=ISO-8859-3 -P replace.cmake + cmake -DINFILE="esdb/ISO-8859/ISO-8859.src" -DOUTFILE="ISO-8859-4.src" -DREGEX=ISO-8859-x -DREPLACE=ISO-8859-4 -P replace.cmake + cmake -DINFILE="esdb/ISO-8859/ISO-8859.src" -DOUTFILE="ISO-8859-5.src" -DREGEX=ISO-8859-x -DREPLACE=ISO-8859-5 -P replace.cmake + cmake -DINFILE="esdb/ISO-8859/ISO-8859.src" -DOUTFILE="ISO-8859-6.src" -DREGEX=ISO-8859-x -DREPLACE=ISO-8859-6 -P replace.cmake + cmake -DINFILE="esdb/ISO-8859/ISO-8859.src" -DOUTFILE="ISO-8859-7.src" -DREGEX=ISO-8859-x -DREPLACE=ISO-8859-7 -P replace.cmake + cmake -DINFILE="esdb/ISO-8859/ISO-8859.src" -DOUTFILE="ISO-8859-8.src" -DREGEX=ISO-8859-x -DREPLACE=ISO-8859-8 -P replace.cmake + cmake -DINFILE="esdb/ISO-8859/ISO-8859.src" -DOUTFILE="ISO-8859-9.src" -DREGEX=ISO-8859-x -DREPLACE=ISO-8859-9 -P replace.cmake + cmake -DINFILE="esdb/ISO-8859/ISO-8859.src" -DOUTFILE="ISO-8859-11.src" -DREGEX=ISO-8859-x -DREPLACE=ISO-8859-11 -P replace.cmake + cmake -DINFILE="esdb/ISO-8859/ISO-8859.src" -DOUTFILE="ISO-8859-15.src" -DREGEX=ISO-8859-x -DREPLACE=ISO-8859-15 -P replace.cmake + mkesdb -o "../data/esdb/ISO-8859/ISO-8859-1.esdb" "ISO-8859-1.src" + mkesdb -o "../data/esdb/ISO-8859/ISO-8859-2.esdb" "ISO-8859-2.src" + mkesdb -o "../data/esdb/ISO-8859/ISO-8859-3.esdb" "ISO-8859-3.src" + mkesdb -o "../data/esdb/ISO-8859/ISO-8859-4.esdb" "ISO-8859-4.src" + mkesdb -o "../data/esdb/ISO-8859/ISO-8859-5.esdb" "ISO-8859-5.src" + mkesdb -o "../data/esdb/ISO-8859/ISO-8859-6.esdb" "ISO-8859-6.src" + mkesdb -o "../data/esdb/ISO-8859/ISO-8859-7.esdb" "ISO-8859-7.src" + mkesdb -o "../data/esdb/ISO-8859/ISO-8859-8.esdb" "ISO-8859-8.src" + mkesdb -o "../data/esdb/ISO-8859/ISO-8859-9.esdb" "ISO-8859-9.src" + mkesdb -o "../data/esdb/ISO-8859/ISO-8859-11.esdb" "ISO-8859-11.src" + mkesdb -o "../data/esdb/ISO-8859/ISO-8859-15.esdb" "ISO-8859-15.src" + cmake -DINFILE="esdb/ISO646/ISO646.src" -DOUTFILE="ISO646-US.src" -DREGEX=ISO646-x -DREPLACE=ISO646-US -P replace.cmake + mkesdb -o "../data/esdb/ISO646/ISO646-US.esdb" "ISO646-US.src" + mkesdb -o "../data/esdb/MISC/JISX0201-KANA.esdb" "esdb/MISC/JISX0201-KANA.src" + mkesdb -o "../data/esdb/MISC/JISX0208@1990.esdb" "esdb/MISC/JISX0208@1990.src" + mkesdb -o "../data/esdb/MISC/Shift_JIS.esdb" "esdb/MISC/Shift_JIS.src" + mkesdb -o "../data/esdb/MISC/JISX0212.esdb" "esdb/MISC/JISX0212.src" + cmake -DINFILE="esdb/UTF/UTF.src" -DOUTFILE="temp01.src" -DREGEX=UTF-mod -DREPLACE=UTF1632 -P replace.cmake + cmake -DINFILE="esdb/UTF/UTF.src" -DOUTFILE="temp03.src" -DREGEX=UTF-mod -DREPLACE=UTF8 -P replace.cmake + cmake -DINFILE="temp01.src" -DOUTFILE="temp04.src" -DREGEX=UTF-x -DREPLACE=UTF-16-INTERNAL -P replace.cmake + cmake -DINFILE="temp01.src" -DOUTFILE="temp05.src" -DREGEX=UTF-x -DREPLACE=UTF-16-SWAPPED -P replace.cmake + cmake -DINFILE="temp01.src" -DOUTFILE="temp06.src" -DREGEX=UTF-x -DREPLACE=UTF-16 -P replace.cmake + cmake -DINFILE="temp01.src" -DOUTFILE="temp07.src" -DREGEX=UTF-x -DREPLACE=UTF-16BE -P replace.cmake + cmake -DINFILE="temp01.src" -DOUTFILE="temp08.src" -DREGEX=UTF-x -DREPLACE=UTF-16LE -P replace.cmake + cmake -DINFILE="temp01.src" -DOUTFILE="temp09.src" -DREGEX=UTF-x -DREPLACE=UTF-32-INTERNAL -P replace.cmake + cmake -DINFILE="temp01.src" -DOUTFILE="temp10.src" -DREGEX=UTF-x -DREPLACE=UTF-32-SWAPPED -P replace.cmake + cmake -DINFILE="temp01.src" -DOUTFILE="temp11.src" -DREGEX=UTF-x -DREPLACE=UTF-32 -P replace.cmake + cmake -DINFILE="temp01.src" -DOUTFILE="temp12.src" -DREGEX=UTF-x -DREPLACE=UTF-32BE -P replace.cmake + cmake -DINFILE="temp01.src" -DOUTFILE="temp13.src" -DREGEX=UTF-x -DREPLACE=UTF-32LE -P replace.cmake + cmake -DINFILE="temp03.src" -DOUTFILE="temp15.src" -DREGEX=UTF-x -DREPLACE=UTF-8 -P replace.cmake + cmake -DINFILE="temp04.src" -DOUTFILE="UTF-16-INTERNAL.src" -DREGEX=UTF-var -DREPLACE=utf16,internal,force -P replace.cmake + cmake -DINFILE="temp05.src" -DOUTFILE="UTF-16-SWAPPED.src" -DREGEX=UTF-var -DREPLACE=utf16,swapped,force -P replace.cmake + cmake -DINFILE="temp06.src" -DOUTFILE="UTF-16.src" -DREGEX=UTF-var -DREPLACE=utf16 -P replace.cmake + cmake -DINFILE="temp07.src" -DOUTFILE="UTF-16BE.src" -DREGEX=UTF-var -DREPLACE=utf16,big,force -P replace.cmake + cmake -DINFILE="temp08.src" -DOUTFILE="UTF-16LE.src" -DREGEX=UTF-var -DREPLACE=utf16,little,force -P replace.cmake + cmake -DINFILE="temp09.src" -DOUTFILE="UTF-32-INTERNAL.src" -DREGEX=UTF-var -DREPLACE=utf32,internal,force -P replace.cmake + cmake -DINFILE="temp10.src" -DOUTFILE="UTF-32-SWAPPED.src" -DREGEX=UTF-var -DREPLACE=utf32,swapped,force -P replace.cmake + cmake -DINFILE="temp11.src" -DOUTFILE="UTF-32.src" -DREGEX=UTF-var -DREPLACE=utf32 -P replace.cmake + cmake -DINFILE="temp12.src" -DOUTFILE="UTF-32BE.src" -DREGEX=UTF-var -DREPLACE=utf32,big,force -P replace.cmake + cmake -DINFILE="temp13.src" -DOUTFILE="UTF-32LE.src" -DREGEX=UTF-var -DREPLACE=utf32,little,force -P replace.cmake + cmake -DINFILE="temp15.src" -DOUTFILE="UTF-8.src" -DREGEX=UTF-var -DREPLACE=utf8 -P replace.cmake + mkesdb -o "../data/esdb/UTF/UTF-16-INTERNAL.esdb" "UTF-16-INTERNAL.src" + mkesdb -o "../data/esdb/UTF/UTF-16-SWAPPED.esdb" "UTF-16-SWAPPED.src" + mkesdb -o "../data/esdb/UTF/UTF-16.esdb" "UTF-16.src" + mkesdb -o "../data/esdb/UTF/UTF-16BE.esdb" "UTF-16BE.src" + mkesdb -o "../data/esdb/UTF/UTF-16LE.esdb" "UTF-16LE.src" + mkesdb -o "../data/esdb/UTF/UTF-32-INTERNAL.esdb" "UTF-32-INTERNAL.src" + mkesdb -o "../data/esdb/UTF/UTF-32-SWAPPED.esdb" "UTF-32-SWAPPED.src" + mkesdb -o "../data/esdb/UTF/UTF-32.esdb" "UTF-32.src" + mkesdb -o "../data/esdb/UTF/UTF-32BE.esdb" "UTF-32BE.src" + mkesdb -o "../data/esdb/UTF/UTF-32LE.esdb" "UTF-32LE.src" + mkesdb -o "../data/esdb/UTF/UTF-8.esdb" "UTF-8.src" + mkesdb -m -o "../data/esdb/esdb.dir.db" "esdb/esdb.dir" + mkesdb -m -o "../data/esdb/esdb.alias.db" "esdb/esdb.alias" + + +install: install-bin + +install-bin: + +clean: + rm ISO-8859-1.src ISO-8859-2.src ISO-8859-3.src ISO-8859-4.src ISO-8859-5.src ISO-8859-6.src ISO-8859-7.src ISO-8859-8.src ISO-8859-9.src ISO-8859-11.src ISO-8859-15.src ISO646-US.src + rm temp01.src temp03.src temp04.src temp05.src temp06.src temp07.src temp08.src temp09.src temp10.src temp11.src temp12.src temp13.src temp15.src + rm UTF-16-INTERNAL.src UTF-16-SWAPPED.src UTF-16.src UTF-16BE.src UTF-16LE.src UTF-32-INTERNAL.src UTF-32-SWAPPED.src UTF-32.src UTF-32BE.src UTF-32LE.src UTF-8.src + +distclean: clean + +dependencies: diff --git a/oficonv/docs/Makefile.in b/oficonv/docs/Makefile.in new file mode 100644 index 0000000000..db2b71f615 --- /dev/null +++ b/oficonv/docs/Makefile.in @@ -0,0 +1,29 @@ +# +# Makefile for dcmdata/docs +# + +@SET_MAKE@ + +SHELL = /bin/sh +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +configdir = @top_srcdir@/@configdir@ + +include $(configdir)/@common_makefile@ + +files = datadict.txt + + +all: + +install: + $(configdir)/mkinstalldirs $(DESTDIR)$(docdir) + for file in $(files); do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(docdir) ;\ + done + +clean: + rm -f $(TRASH) + +distclean: + rm -f $(DISTTRASH) diff --git a/oficonv/include/Makefile.in b/oficonv/include/Makefile.in new file mode 100644 index 0000000000..2510302878 --- /dev/null +++ b/oficonv/include/Makefile.in @@ -0,0 +1,32 @@ +# +# Makefile for dcmdata/include +# + +@SET_MAKE@ + +SHELL = /bin/sh +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +configdir = @top_srcdir@/@configdir@ + +include $(configdir)/@common_makefile@ + + +all: + +install: + $(configdir)/mkinstalldirs $(DESTDIR)$(includedir)/dcmtk/dcmdata + for file in dcmtk/dcmdata/*.h ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/dcmtk/dcmdata ;\ + done + $(configdir)/mkinstalldirs $(DESTDIR)$(includedir)/dcmtk/dcmdata/libi2d + for file in dcmtk/dcmdata/libi2d/*.h ; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/dcmtk/dcmdata/libi2d ;\ + done + + +clean: + rm -f $(TRASH) + +distclean: + rm -f $(DISTTRASH) diff --git a/oficonv/libsrc/Makefile.dep b/oficonv/libsrc/Makefile.dep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/oficonv/libsrc/Makefile.in b/oficonv/libsrc/Makefile.in new file mode 100644 index 0000000000..5d7714aaff --- /dev/null +++ b/oficonv/libsrc/Makefile.in @@ -0,0 +1,64 @@ +# +# Makefile for oficonv/libsrc +# + +@SET_MAKE@ + +SHELL = /bin/sh +VPATH = @srcdir@:@top_srcdir@/include:@top_srcdir@/@configdir@/include +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +configdir = @top_srcdir@/@configdir@ + +include $(configdir)/@common_makefile@ + +ofstddir = $(top_srcdir)/../ofstd + +LOCALINCLUDES = -I$(ofstddir)/include +LIBDIRS = +LOCALLIBS = +LOCALDEFS = + +objs = \ + citrus_bcs.o citrus_bcs_strtol.o citrus_bcs_strtoul.o citrus_big5.o citrus_csmapper.o \ + citrus_db.o citrus_db_factory.o citrus_db_hash.o citrus_dechanyu.o citrus_esdb.o \ + citrus_euc.o citrus_euctw.o citrus_gbk2k.o citrus_hash.o citrus_hz.o citrus_iconv.o \ + citrus_iconv_none.o citrus_iconv_std.o citrus_iso2022.o citrus_jisx0208.o \ + citrus_johab.o citrus_lookup.o citrus_lookup_factory.o citrus_mapper_646.o \ + citrus_mapper.o citrus_mapper_none.o citrus_mapper_serial.o citrus_mapper_std.o \ + citrus_mapper_zone.o citrus_memstream.o citrus_mmap.o citrus_module.o citrus_mskanji.o \ + citrus_none.o citrus_pivot_factory.o citrus_prop.o citrus_stdenc.o citrus_ues.o \ + citrus_utf1632.o citrus_utf7.o citrus_utf8.o citrus_viqr.o citrus_zw.o data_csmapper.o \ + data_esdb.o oficonv_iconv.o oficonv_logger.o oficonv_strcasestr.o oficonv_strlcpy.o + +library = liboficonv.$(LIBEXT) + +all: $(library) + +install: install-lib install-support + +install-lib: $(library) + $(configdir)/mkinstalldirs $(DESTDIR)$(libdir) + $(INSTALL_DATA) $(library) $(DESTDIR)$(libdir)/$(library) + $(RANLIB) $(DESTDIR)$(libdir)/$(library) + +$(library): $(objs) + $(AR) $(ARFLAGS) $@ $(objs) + $(RANLIB) $@ + + +# Clean-up + +clean: + rm -f $(support_progs) $(support_objs) $(objs) $(library) $(TRASH) + +distclean: clean + rm -f $(DISTTRASH) + + +# Dependencies + +dependencies: + $(CXX) -MM $(defines) $(includes) $(CPPFLAGS) $(CXXFLAGS) *.cc > $(DEP) + +include $(DEP) diff --git a/oficonv/tests/Makefile.dep b/oficonv/tests/Makefile.dep index e69de29bb2..9dac3bfdf3 100644 --- a/oficonv/tests/Makefile.dep +++ b/oficonv/tests/Makefile.dep @@ -0,0 +1,177 @@ +oficonv_tests.o: oficonv_tests.cc \ + ../../config/include/dcmtk/config/osconfig.h oficonv_tests.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../include/dcmtk/oficonv/iconv.h ../include/dcmtk/oficonv/oidefine.h \ + ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h +tests.o: tests.cc ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h +ticonv.o: ticonv.cc ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ + ../include/dcmtk/oficonv/iconv.h ../include/dcmtk/oficonv/oidefine.h \ + oficonv_tests.h tables_invalids.h +ticonv_chinese.o: ticonv_chinese.cc \ + ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h oficonv_tests.h \ + ../include/dcmtk/oficonv/iconv.h ../include/dcmtk/oficonv/oidefine.h \ + tables_gb18030.h tables_gb2312.h tables_gbk.h +ticonv_iso8859.o: ticonv_iso8859.cc \ + ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ + ../include/dcmtk/oficonv/iconv.h ../include/dcmtk/oficonv/oidefine.h \ + oficonv_tests.h tables_iso8859.h +ticonv_japanese.o: ticonv_japanese.cc \ + ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h oficonv_tests.h \ + ../include/dcmtk/oficonv/iconv.h ../include/dcmtk/oficonv/oidefine.h \ + tables_jis_x0201.h tables_jis_x0208.h tables_jis_x0212.h +ticonv_korean.o: ticonv_korean.cc \ + ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ + ../include/dcmtk/oficonv/iconv.h ../include/dcmtk/oficonv/oidefine.h \ + oficonv_tests.h tables_ksx_1001.h diff --git a/oficonv/tests/Makefile.in b/oficonv/tests/Makefile.in index a2bdbfab57..fff4dc977a 100644 --- a/oficonv/tests/Makefile.in +++ b/oficonv/tests/Makefile.in @@ -12,37 +12,40 @@ configdir = @top_srcdir@/@configdir@ include $(configdir)/@common_makefile@ -LOCALINCLUDES = -I$(top_srcdir)/include -LIBDIRS = -L$(top_srcdir)/libsrc -LOCALLIBS = -lofstd $(CHARCONVLIBS) $(MATHLIBS) -LOCALTRASH = +ofstddir = $(top_srcdir)/../ofstd -test_objs = tests.o ticonv.o -objs = $(test_objs) -progs = tests +LOCALINCLUDES = -I$(top_srcdir)/include -I$(ofstddir)/include -I$(configdir)/include +LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc +LOCALLIBS = -loficonv -lofstd $(CHARCONVLIBS) $(MATHLIBS) + +objs = tests.o oficonv_tests.o ticonv.o ticonv_iso8859.o ticonv_chinese.o \ + ticonv_japanese.o ticonv_korean.o +progs = tests -all: $(progs) +# in order to avoid a cyclic dependency between ofstd and oficonv, we only compile +# the binaries for the unit test here, but perform the linking step in ofstd/tests +# when both libofstd.a and liboficonv.a are available -tests: $(test_objs) - $(CXX) $(CXXFLAGS) $(LIBDIRS) $(LDFLAGS) -o $@ $(test_objs) $(LOCALLIBS) $(LIBS) +all: $(objs) +tests: $(objs) + $(CXX) $(CXXFLAGS) $(LIBDIRS) $(LDFLAGS) -o $@ $(objs) $(I2DLIBS) $(LOCALLIBS) $(LIBS) check: tests - ./tests + DCMDICTPATH=../data/dicom.dic ./tests check-exhaustive: tests - ./tests -x + DCMDICTPATH=../data/dicom.dic ./tests -x install: all - clean: - rm -f $(objs) $(progs) $(LOCALTRASH) $(TRASH) + rm -f $(objs) $(progs) $(TRASH) distclean: - rm -f $(objs) $(progs) $(LOCALTRASH) $(DISTTRASH) + rm -f $(objs) $(progs) $(DISTTRASH) dependencies: diff --git a/ofstd/libsrc/Makefile.in b/ofstd/libsrc/Makefile.in index 76c9e64b37..9e101abaf2 100644 --- a/ofstd/libsrc/Makefile.in +++ b/ofstd/libsrc/Makefile.in @@ -11,8 +11,9 @@ top_srcdir = @top_srcdir@ configdir = @top_srcdir@/@configdir@ include $(configdir)/@common_makefile@ +oficonvdir = $(top_srcdir)/../oficonv -LOCALINCLUDES = +LOCALINCLUDES = -I$(oficonvdir)/include LOCALDEFS = objs = oflist.o ofstring.o ofcmdln.o ofconapp.o offname.o ofconsol.o ofthread.o \ diff --git a/ofstd/tests/Makefile.in b/ofstd/tests/Makefile.in index f8710441a4..3cfeb81398 100644 --- a/ofstd/tests/Makefile.in +++ b/ofstd/tests/Makefile.in @@ -11,10 +11,12 @@ top_srcdir = @top_srcdir@ configdir = @top_srcdir@/@configdir@ include $(configdir)/@common_makefile@ +oficonvdir = $(top_srcdir)/../oficonv +oficonvtest = $(oficonvdir)/tests LOCALINCLUDES = -I$(top_srcdir)/include -LIBDIRS = -L$(top_srcdir)/libsrc -LOCALLIBS = -lofstd $(CHARCONVLIBS) $(MATHLIBS) +LIBDIRS = -L$(top_srcdir)/libsrc -L$(oficonvdir)/libsrc +LOCALLIBS = -lofstd -loficonv $(CHARCONVLIBS) $(MATHLIBS) LOCALTRASH = *.out testfile.\$$\$$\$$ test_objs = tests.o tatof.o tmap.o tvec.o tfilsys.o tftoa.o tthread.o \ @@ -22,14 +24,26 @@ test_objs = tests.o tatof.o tmap.o tvec.o tfilsys.o tftoa.o tthread.o \ tmarkup.o tchrenc.o txml.o tuuid.o toffile.o tmem.o toption.o \ ttuple.o tlimits.o tvariant.o terror.o objs = $(test_objs) -progs = tests - +progs = tests oficonv_tests all: $(progs) tests: $(test_objs) $(CXX) $(CXXFLAGS) $(LIBDIRS) $(LDFLAGS) -o $@ $(test_objs) $(LOCALLIBS) $(LIBS) +# in order to avoid a cyclic dependency between ofstd and oficonv, we only compile +# the binaries for the unit test in module oficonv, but perform the linking step here +# since both libofstd.a and liboficonv.a are available now + +oficonv_objs = $(oficonvtest)/tests.o $(oficonvtest)/oficonv_tests.o \ + $(oficonvtest)/ticonv.o $(oficonvtest)/ticonv_iso8859.o \ + $(oficonvtest)/ticonv_chinese.o $(oficonvtest)/ticonv_japanese.o \ + $(oficonvtest)/ticonv_korean.o + +.PHONY: oficonv_tests + +oficonv_tests: + $(CXX) $(CXXFLAGS) $(LIBDIRS) $(LDFLAGS) -o $(oficonvtest)/tests $(oficonv_objs) $(LOCALLIBS) $(LIBS) check: tests ./tests