diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2023-02-21 13:19:29 +0000 |
|---|---|---|
| committer | Lucas De Marchi <lucas.de.marchi@gmail.com> | 2023-02-21 16:35:42 -0800 |
| commit | e4c1a5b2998bc2c9dbcff8d62f121d1f8f5f4fe5 (patch) | |
| tree | 2372367c1356c2c860af8b88aaedabf0d5553394 | |
| parent | 06e6f167c211106212290aa7980880f972d71ba2 (diff) | |
| download | kmod-e4c1a5b2998bc2c9dbcff8d62f121d1f8f5f4fe5.tar.gz | |
configure: manage libkmod.pc.in and version.py.in via AC_CONFIG_FILES
Replace the manual sed command, build rules and dist/clean for using
AC_CONFIG_FILES. It does the exact same thing, with an added bonus...
Currently we're missing version.py.in in the EXTRA_DIST. Thus a simple
"touch Makefile" should retrigger the regeneration of version.py. Which
would presumably fail, since the input file isn't in the distribution
tarball.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
| -rw-r--r-- | Makefile.am | 25 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index 61dbdf0..8ba85c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,26 +24,6 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(OUR_CFLAGS) AM_LDFLAGS = $(OUR_LDFLAGS) -SED_PROCESS = \ - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ - -e 's,@VERSION\@,$(VERSION),g' \ - -e 's,@prefix\@,$(prefix),g' \ - -e 's,@exec_prefix\@,$(exec_prefix),g' \ - -e 's,@libdir\@,$(libdir),g' \ - -e 's,@includedir\@,$(includedir),g' \ - -e 's,@libzstd_CFLAGS\@,${libzstd_CFLAGS},g' \ - -e 's,@libzstd_LIBS\@,${libzstd_LIBS},g' \ - -e 's,@liblzma_CFLAGS\@,${liblzma_CFLAGS},g' \ - -e 's,@liblzma_LIBS\@,${liblzma_LIBS},g' \ - -e 's,@zlib_CFLAGS\@,${zlib_CFLAGS},g' \ - -e 's,@zlib_LIBS\@,${zlib_LIBS},g' \ - -e 's,@libcrypto_CFLAGS\@,${libcrypto_CFLAGS},g' \ - -e 's,@libcrypto_LIBS\@,${libcrypto_LIBS},g' \ - < $< > $@ || rm $@ - -%.pc: %.pc.in Makefile - $(SED_PROCESS) - # Rules for libtool versioning (from https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html) # 1. Start with version information of ‘0:0:0’ for each libtool library. # 2. Update the version information only immediately before a public release of @@ -116,8 +96,6 @@ libkmod_libkmod_internal_la_LIBADD = $(libkmod_libkmod_la_LIBADD) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libkmod/libkmod.pc -EXTRA_DIST += libkmod/libkmod.pc.in -CLEANFILES += libkmod/libkmod.pc bashcompletiondir=@bashcompletiondir@ dist_bashcompletion_DATA = \ @@ -179,9 +157,6 @@ am__v_CYTHON_0 = @echo " CYTHON " $@; .pyx.c: $(AM_V_CYTHON)$(CYTHON) -o $@ $< -%.py: %.py.in Makefile - $(SED_PROCESS) - # Remove some warnings for generated code PYTHON_NOWARN = -Wno-redundant-decls -Wno-shadow -Wno-strict-aliasing diff --git a/configure.ac b/configure.ac index 892f5d9..65902d1 100644 --- a/configure.ac +++ b/configure.ac @@ -292,6 +292,8 @@ AC_CONFIG_FILES([ man/Makefile libkmod/docs/Makefile libkmod/docs/version.xml + libkmod/libkmod.pc + libkmod/python/kmod/version.py ]) |