c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Only build xmlcatalog executable if enabled

Browse Source
This commit is contained in:
Nick Wellnhofer 2024-11-21 23:17:07 +01:00
parent a5764b56d2
commit 52afde07c1
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -439,12 +439,11 @@ endif()
if(LIBXML2_WITH_PROGRAMS) if(LIBXML2_WITH_PROGRAMS)
add_executable(xmllint xmllint.c shell.c) add_executable(xmllint xmllint.c shell.c)
add_executable(xmlcatalog xmlcatalog.c) set(PROGRAMS xmllint)
set( if(LIBXML2_WITH_CATALOG AND LIBXML2_WITH_OUTPUT)
PROGRAMS add_executable(xmlcatalog xmlcatalog.c)
xmlcatalog list(APPEND PROGRAMS xmlcatalog)
xmllint endif()
)
foreach(PROGRAM ${PROGRAMS}) foreach(PROGRAM ${PROGRAMS})
add_executable(LibXml2::${PROGRAM} ALIAS ${PROGRAM}) add_executable(LibXml2::${PROGRAM} ALIAS ${PROGRAM})
target_link_libraries(${PROGRAM} LibXml2) target_link_libraries(${PROGRAM} LibXml2)

16
Makefile.am
View File

@ -26,7 +26,7 @@ check_PROGRAMS = \
testparser \ testparser \
testrecurse testrecurse
bin_PROGRAMS = xmllint xmlcatalog bin_PROGRAMS = xmllint
bin_SCRIPTS = xml2-config bin_SCRIPTS = xml2-config
@ -48,6 +48,15 @@ if WITH_C14N_SOURCES
libxml2_la_SOURCES += c14n.c libxml2_la_SOURCES += c14n.c
endif endif
if WITH_CATALOG_SOURCES if WITH_CATALOG_SOURCES
if WITH_OUTPUT_SOURCES
bin_PROGRAMS += xmlcatalog
xmlcatalog_SOURCES = xmlcatalog.c
xmlcatalog_CFLAGS = $(AM_CFLAGS) $(RDL_CFLAGS) $(ICONV_CFLAGS)
xmlcatalog_DEPENDENCIES = $(DEPS)
xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS)
endif
libxml2_la_SOURCES += catalog.c libxml2_la_SOURCES += catalog.c
endif endif
if WITH_DEBUG_SOURCES if WITH_DEBUG_SOURCES
@ -138,11 +147,6 @@ xmllint_CFLAGS = $(AM_CFLAGS) $(RDL_CFLAGS) $(ICONV_CFLAGS)
xmllint_DEPENDENCIES = $(DEPS) xmllint_DEPENDENCIES = $(DEPS)
xmllint_LDADD= $(RDL_LIBS) $(LDADDS) xmllint_LDADD= $(RDL_LIBS) $(LDADDS)
xmlcatalog_SOURCES=xmlcatalog.c
xmlcatalog_CFLAGS = $(AM_CFLAGS) $(RDL_CFLAGS) $(ICONV_CFLAGS)
xmlcatalog_DEPENDENCIES = $(DEPS)
xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS)
testModule_SOURCES=testModule.c testModule_SOURCES=testModule.c
testModule_DEPENDENCIES = $(DEPS) testModule_DEPENDENCIES = $(DEPS)
testModule_LDADD= $(LDADDS) testModule_LDADD= $(LDADDS)

16
meson.build
View File

@ -484,13 +484,15 @@ executable(
## xmlcatalog tool ## xmlcatalog tool
executable( if want_catalog and want_output
'xmlcatalog', executable(
files('xmlcatalog.c'), 'xmlcatalog',
dependencies: [xml_dep, xmllint_deps], files('xmlcatalog.c'),
include_directories: config_dir, dependencies: [xml_dep, xmllint_deps],
install: true, include_directories: config_dir,
) install: true,
)
endif
## testdso module ## testdso module