diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-11-23 03:26:44 +0000 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-11-23 07:50:57 +0000 |
commit | ed4e53a0e7702ed259f5590727feb3750a21c45b (patch) | |
tree | 06b12bffe880c7503e1e7eb27a5ee1be1f65798e | |
parent | 391f11a7ec16045ed5909d617edcaada1f8f9afc (diff) | |
download | wireshark-ed4e53a0e7702ed259f5590727feb3750a21c45b.tar.gz |
Fix 'make dumpapi' target
Broken by 67d9daa65b9d555ced9fb1a9df90b1f8f1a4a257.
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>
-rw-r--r-- | Makefile.am.inc | 9 | ||||
-rw-r--r-- | abi-descriptor.template | 24 |
2 files changed, 19 insertions, 14 deletions
diff --git a/Makefile.am.inc b/Makefile.am.inc index 5a107689e7..9bf5cf87d2 100644 --- a/Makefile.am.inc +++ b/Makefile.am.inc @@ -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|' $< > $@ diff --git a/abi-descriptor.template b/abi-descriptor.template index 43dd9a6fd6..8f1be3e52e 100644 --- a/abi-descriptor.template +++ b/abi-descriptor.template @@ -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> |