Catch exceptions from AVP subdissectors in case the AVPs following the one

[metze/wireshark/wip.git] / Makefile.am.inc

diff --git a/Makefile.am.inc b/Makefile.am.inc
index 9ed0ab2c87ba08d0a00bed7fb4746bf655d6ebd5..8cad089665994d4fa5b4eb9f39c2a93494a8024c 100644 (file)
--- a/Makefile.am.inc
+++ b/Makefile.am.inc
@@ -19,15 +19,33 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+AUTOMAKE_OPTIONS = -Wno-portability
+
+AM_V_AWK = $(am__v_AWK_@AM_V@)
+am__v_AWK_ = $(am__v_AWK_@AM_DEFAULT_V@)
+am__v_AWK_0 = @echo "  AWK     " $@;
+
+AM_V_LEMON = $(am__v_LEMON_@AM_V@)
+am__v_LEMON_ = $(am__v_LEMON_@AM_DEFAULT_V@)
+am__v_LEMON_0 = @echo "  LEMON   " $@;
+
+AM_V_RUNLEX = $(am__v_RUNLEX_@AM_V@)
+am__v_RUNLEX_ = $(am__v_RUNLEX_@AM_DEFAULT_V@)
+am__v_RUNLEX_0 = @echo "  RUNLEX  " $@;
+
+AM_V_SED = $(am__v_SED_@AM_V@)
+am__v_SED_ = $(am__v_SED_@AM_DEFAULT_V@)
+am__v_SED_0 = @echo "  SED     " $@;
 
 .l.c:
-       $(RUNLEX) "$(LEX)" -o$@ $<
+       $(AM_V_RUNLEX)$(RUNLEX) "$(LEX)" -o$@ $<
 
 .def.sym:
-       $(AWK) '/^EXPORTS$$/ {next;}; ${def_sym_filter_symbols} /^[^;]/ { print $$1;}' < $< > $@
+       $(AM_V_AWK)$(AWK) '/^EXPORTS$$/ {next;}; ${def_sym_filter_symbols} /^[^;]/ { print $$1;}' < $< > $@
 
 # abi-compliance-checker descriptor
-INCLUDE_DIRS = $(subst -I,NEWLINE,$(filter -I%, $(CFLAGS)))
+INCLUDE_DIRS = $(subst -I,NEWLINE,$(filter -I%, $(CFLAGS) -I$(abs_top_srcdir) -I$(abs_srcdir)))
 abi-descriptor.xml: ../abi-descriptor.template
-       sed "s|INCLUDE_DIRS|$(INCLUDE_DIRS)|g;s/NEWLINE/\n    /g" $< > $@
+       $(AM_V_SED)sed "s|@INCLUDE_DIRS@|$(INCLUDE_DIRS)|g;s/NEWLINE/\n    /g;s|@LIBRARY_OUTPUT_PATH@|{RELPATH}/.libs|" $< > $@