Skip to content

Commit 84b9a74

Browse files
committed
meson: generate configmake.h
We don't use all of the defines so copy only the ones actually used. Signed-off-by: Pavel Hrdina <[email protected]> Reviewed-by: Ján Tomko <[email protected]> Reviewed-by: Peter Krempa <[email protected]> Reviewed-by: Neal Gompa <[email protected]>
1 parent 2d6cbca commit 84b9a74

File tree

3 files changed

+39
-43
lines changed

3 files changed

+39
-43
lines changed

Makefile.am

-43
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ check-local: all tests
4242
check-access: all
4343
@($(MAKE) $(AM_MAKEFLAGS) -C tests check-access)
4444

45-
BUILT_SOURCES = configmake.h
46-
4745
dist-hook: gen-AUTHORS
4846

4947
.PHONY: gen-AUTHORS
@@ -65,44 +63,3 @@ gen-AUTHORS:
6563

6664
ci-%:
6765
$(MAKE) -C $(srcdir)/ci/ $@
68-
69-
# Listed in the same order as the GNU makefile conventions, and
70-
# provided by autoconf 2.59c+ or 2.70.
71-
# The Automake-defined pkg* macros are appended, in the order
72-
# listed in the Automake 1.10a+ documentation.
73-
configmake.h: Makefile
74-
$(AM_V_GEN)rm -f $@-t && \
75-
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
76-
echo '#if WIN32'; \
77-
echo '# include <winsock2.h> /* avoid mingw pollution on DATADIR */'; \
78-
echo '#endif'; \
79-
echo '#define PREFIX "$(prefix)"'; \
80-
echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
81-
echo '#define BINDIR "$(bindir)"'; \
82-
echo '#define SBINDIR "$(sbindir)"'; \
83-
echo '#define LIBEXECDIR "$(libexecdir)"'; \
84-
echo '#define DATAROOTDIR "$(datarootdir)"'; \
85-
echo '#define DATADIR "$(datadir)"'; \
86-
echo '#define SYSCONFDIR "$(sysconfdir)"'; \
87-
echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
88-
echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
89-
echo '#define RUNSTATEDIR "$(runstatedir)"'; \
90-
echo '#define INCLUDEDIR "$(includedir)"'; \
91-
echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
92-
echo '#define DOCDIR "$(docdir)"'; \
93-
echo '#define INFODIR "$(infodir)"'; \
94-
echo '#define HTMLDIR "$(htmldir)"'; \
95-
echo '#define DVIDIR "$(dvidir)"'; \
96-
echo '#define PDFDIR "$(pdfdir)"'; \
97-
echo '#define PSDIR "$(psdir)"'; \
98-
echo '#define LIBDIR "$(libdir)"'; \
99-
echo '#define LISPDIR "$(lispdir)"'; \
100-
echo '#define LOCALEDIR "$(localedir)"'; \
101-
echo '#define MANDIR "$(mandir)"'; \
102-
echo '#define MANEXT "$(manext)"'; \
103-
echo '#define PKGDATADIR "$(pkgdatadir)"'; \
104-
echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
105-
echo '#define PKGLIBDIR "$(pkglibdir)"'; \
106-
echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
107-
} | sed '/""/d' > $@-t && \
108-
mv -f $@-t $@

configmake.h.in

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
2+
#if WIN32
3+
# include <winsock2.h> /* avoid mingw pollution on DATADIR */
4+
#endif
5+
#mesondefine BINDIR
6+
#mesondefine DATADIR
7+
#mesondefine LIBDIR
8+
#mesondefine LIBEXECDIR
9+
#mesondefine LOCALEDIR
10+
#mesondefine LOCALSTATEDIR
11+
#mesondefine MANDIR
12+
#mesondefine PKGDATADIR
13+
#mesondefine PREFIX
14+
#mesondefine RUNSTATEDIR
15+
#mesondefine SBINDIR
16+
#mesondefine SYSCONFDIR

meson.build

+23
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,29 @@ docdir = datadir / 'doc' / meson.project_name()
9292
pkgdatadir = datadir / meson.project_name()
9393

9494

95+
# generate configmake.h header
96+
97+
configmake_conf = configuration_data()
98+
configmake_conf.set_quoted('BINDIR', bindir)
99+
configmake_conf.set_quoted('DATADIR', datadir)
100+
configmake_conf.set_quoted('LIBDIR', libdir)
101+
configmake_conf.set_quoted('LIBEXECDIR', libexecdir)
102+
configmake_conf.set_quoted('LOCALEDIR', localedir)
103+
configmake_conf.set_quoted('LOCALSTATEDIR', localstatedir)
104+
configmake_conf.set_quoted('MANDIR', mandir)
105+
configmake_conf.set_quoted('PKGDATADIR', pkgdatadir)
106+
configmake_conf.set_quoted('PREFIX', prefix)
107+
configmake_conf.set_quoted('RUNSTATEDIR', runstatedir)
108+
configmake_conf.set_quoted('SBINDIR', sbindir)
109+
configmake_conf.set_quoted('SYSCONFDIR', sysconfdir)
110+
111+
configure_file(
112+
input: 'configmake.h.in',
113+
output: 'configmake.h',
114+
configuration: configmake_conf,
115+
)
116+
117+
95118
# figure out libvirt version strings
96119

97120
arr_version = meson.project_version().split('.')

0 commit comments

Comments
 (0)