osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix 'make dumpapi' target 

Broken by 67d9daa65b.

Also indent XML template.

Change-Id: I3a604a0319d16caca7e191c48c16f42691f4b910
Reviewed-on: https://code.wireshark.org/review/12049
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
João Valverde 2015-11-23 03:26:44 +00:00 committed by Alexis La Goutte
parent 391f11a7ec
commit ed4e53a0e7
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am.inc
View File

@ -44,6 +44,11 @@ am__v_SED_0 = @echo " SED " $@;
$(AM_V_AWK)$(AWK) '/^EXPORTS$$/ {next;}; ${def_sym_filter_symbols} /^[^;]/ { print $$1;}' < $< > $@
# abi-compliance-checker descriptor
INCLUDE_DIRS = $(subst -I,NEWLINE,$(filter -I%, $(CFLAGS) -I$(abs_top_srcdir) -I$(abs_srcdir)))
abi_incdirs = $(subst -I,NEWLINE,$(filter -I%,$(CFLAGS) -I$(abs_top_srcdir) -I$(abs_srcdir)))
abi_sysdirs = $(subst -isystem,NEWLINE,$(filter -isystem%,$(CFLAGS)))
INCLUDE_DIRS = $(abi_incdirs) $(abi_sysdirs)
abi-descriptor.xml: ../abi-descriptor.template
$(AM_V_SED)sed "s|@INCLUDE_DIRS@|$(INCLUDE_DIRS)|g;s/NEWLINE/\n /g;s|@LIBRARY_OUTPUT_PATH@|{RELPATH}/.libs|" $< > $@
$(AM_V_SED)sed \
-e 's|@INCLUDE_DIRS@|$(INCLUDE_DIRS)|g' \
-e 's/ *NEWLINE/\n /g' \
-e 's|@LIBRARY_OUTPUT_PATH@|{RELPATH}/.libs|' $< > $@

24
abi-descriptor.template
View File

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<descriptor>
<version>
<version>
0.0.0
</version>
<headers>
</version>
<headers>
{RELPATH}/abi-check-headers
</headers>
<libs>
</headers>
<libs>
@LIBRARY_OUTPUT_PATH@
</libs>
<include_paths>@INCLUDE_DIRS@
</include_paths>
<gcc_options>
</libs>
<include_paths>@INCLUDE_DIRS@
</include_paths>
<gcc_options>
-D_U_="__attribute((unused))"
</gcc_options>
<include_preamble>
</gcc_options>
<include_preamble>
config.h
</include_preamble>
</include_preamble>
</descriptor>