diff --git a/.gitignore b/.gitignore index 2894950..e914fa0 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ coverity-scan *.tgz /clang-scan /_build/ +udunits.pc diff --git a/CHANGE_LOG b/CHANGE_LOG index 84404d4..603b88b 100644 --- a/CHANGE_LOG +++ b/CHANGE_LOG @@ -1,3 +1,7 @@ +2.3.0.1 + Build: + * Added udunits.pc to build and installation to support software that uses UDUNITS + 2.3.0.0 2023-08-21T08:33:24-0600 Database: * Added "per mille" unit with appropriate symbol and "ppt" diff --git a/Makefile.am b/Makefile.am index 6a0277f..afbb574 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = lib prog DIST_SUBDIRS = lib prog info_TEXINFOS = udunits2.texi +TEXINFO_TEX = ./texinfo.tex EXTRA_DIST = \ CHANGE_LOG \ CMakeLists.txt \ @@ -65,13 +66,12 @@ release: ftp web-update .PHONY: hostchecks hostcheck remote-checks web-update ftp \ download-update available release -udunits2.info: version.texi LICENSE -udunits2.html: version.texi LICENSE -udunits2.pdf: version.texi LICENSE - $(srcdir)/version.texi: $(srcdir)/stamp-vti @cp $(srcdir)/stamp-vti $@ +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = @PACKAGE@.pc + CMakeLists.txt: CHANGE_LOG versionId=`awk '{print $$1;exit}' CHANGE_LOG`; \ if ! `echo "$$versionId" | egrep '^[0-9.]+$$' >/dev/null`; then \ @@ -86,3 +86,4 @@ CMakeLists.txt: CHANGE_LOG else \ touch $@; \ fi; + diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 61cc1c8..739c862 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -99,7 +99,7 @@ install(TARGETS libudunits2 EXPORT udunits2-targets ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin) -install(FILES udunits2.h converter.h DESTINATION include) +install(FILES udunits2.h DimPow.h converter.h DESTINATION include) install(FILES udunits2.xml udunits2-accepted.xml diff --git a/lib/Makefile.am b/lib/Makefile.am index 818e8ac..782c916 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -20,6 +20,8 @@ SUBDIRS = xmlFailures xmlSuccesses lib_LTLIBRARIES = libudunits2.la libudunits2_la_SOURCES = unitcore.c \ + DimPow.c DimPow.h \ + DimVec.c DimVec.h \ converter.c \ formatter.c \ idToUnitMap.c idToUnitMap.h \