Allow checkapis target to work in out-of-tree builds (s#../../#$(top_srcdir)).

Also use $(top_builddir) instead of ../../ in a couple of other spots.

svn path=/trunk/; revision=25863

29 files changed, 33 insertions, 33 deletions

diff --git a/plugins/agentx/Makefile.am b/plugins/agentx/Makefile.am
index d923004e4b..995adfb34b 100644
--- a/plugins/agentx/Makefile.am
+++ b/plugins/agentx/Makefile.am
@@ -125,4 +125,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/artnet/Makefile.am b/plugins/artnet/Makefile.am
index 708b4a6610..5ab499b0e5 100644
--- a/plugins/artnet/Makefile.am
+++ b/plugins/artnet/Makefile.am
@@ -124,4 +124,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am
index 30211fb98a..faea652a91 100644
--- a/plugins/asn1/Makefile.am
+++ b/plugins/asn1/Makefile.am
@@ -123,4 +123,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/ciscosm/Makefile.am b/plugins/ciscosm/Makefile.am
index e9c3a8c745..e22aed0572 100644
--- a/plugins/ciscosm/Makefile.am
+++ b/plugins/ciscosm/Makefile.am
@@ -126,4 +126,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index 844872af94..213f037748 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -125,4 +125,4 @@ EXTRA_DIST = \
 	README
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/enttec/Makefile.am b/plugins/enttec/Makefile.am
index 867e79ab3b..063a5109eb 100644
--- a/plugins/enttec/Makefile.am
+++ b/plugins/enttec/Makefile.am
@@ -124,4 +124,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am
index f49afdeb84..17940df96a 100644
--- a/plugins/ethercat/Makefile.am
+++ b/plugins/ethercat/Makefile.am
@@ -124,4 +124,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/giop/Makefile.am b/plugins/giop/Makefile.am
index 6fed5059cc..8058fa5930 100644
--- a/plugins/giop/Makefile.am
+++ b/plugins/giop/Makefile.am
@@ -66,7 +66,7 @@ EXTRA_DIST = \
 	Makefile.nmake
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput \
 	packet-cosnaming.c \
 	packet-coseventcomm.c \
 	packet-tango.c \
diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
index e505dbe98b..415717f9ae 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/gryphon/Makefile.am
@@ -126,4 +126,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/infiniband/Makefile.am b/plugins/infiniband/Makefile.am
index 2b4f001ad2..1fbb3a47b6 100644
--- a/plugins/infiniband/Makefile.am
+++ b/plugins/infiniband/Makefile.am
@@ -124,4 +124,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
index 221bf3ba2e..9de1dc98dd 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/irda/Makefile.am
@@ -124,4 +124,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/lwres/Makefile.am b/plugins/lwres/Makefile.am
index da1e8d4758..0b830f057c 100644
--- a/plugins/lwres/Makefile.am
+++ b/plugins/lwres/Makefile.am
@@ -124,4 +124,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am
index a8ff6d66e4..0dae114498 100644
--- a/plugins/m2m/Makefile.am
+++ b/plugins/m2m/Makefile.am
@@ -125,4 +125,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am
index 13edc84a3d..3a4dd298d9 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/mate/Makefile.am
@@ -22,7 +22,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-include ../../Makefile.am.inc
+include $(top_srcdir)/Makefile.am.inc
 
 INCLUDES = -I$(top_srcdir)
 
@@ -137,7 +137,7 @@ RUNLEX = $(top_srcdir)/tools/runlex.sh
 
 mate_parser_lex.h : mate_parser.c
 
-LEMON = ../../tools/lemon
+LEMON = $(top_builddir)/tools/lemon
 
 mate_grammar.h : mate_grammar.c
 mate_grammar.c : mate_grammar.lemon mate.h mate_util.h $(LEMON)/lemon$(EXEEXT)
@@ -145,4 +145,4 @@ mate_grammar.c : mate_grammar.lemon mate.h mate_util.h $(LEMON)/lemon$(EXEEXT)
 		(rm -f grammar.c grammar.h ; false)
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am
index ec29130921..ec9852cb19 100644
--- a/plugins/opcua/Makefile.am
+++ b/plugins/opcua/Makefile.am
@@ -127,4 +127,4 @@ EXTRA_DIST = \
 	README
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/opsi/Makefile.am b/plugins/opsi/Makefile.am
index c1454eb22c..9c37db5db3 100644
--- a/plugins/opsi/Makefile.am
+++ b/plugins/opsi/Makefile.am
@@ -124,4 +124,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/pcli/Makefile.am b/plugins/pcli/Makefile.am
index 989c7ef32a..dce2bf8490 100644
--- a/plugins/pcli/Makefile.am
+++ b/plugins/pcli/Makefile.am
@@ -124,4 +124,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am
index 66239ac3e5..c1e24b745a 100644
--- a/plugins/profinet/Makefile.am
+++ b/plugins/profinet/Makefile.am
@@ -125,4 +125,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/rlm/Makefile.am b/plugins/rlm/Makefile.am
index faf807b8d0..c79eae290c 100644
--- a/plugins/rlm/Makefile.am
+++ b/plugins/rlm/Makefile.am
@@ -125,4 +125,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/rtnet/Makefile.am b/plugins/rtnet/Makefile.am
index 03d64ac681..f3320fb8a5 100644
--- a/plugins/rtnet/Makefile.am
+++ b/plugins/rtnet/Makefile.am
@@ -124,4 +124,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/rudp/Makefile.am b/plugins/rudp/Makefile.am
index 0bb3185b0e..e6fa6ea0d0 100644
--- a/plugins/rudp/Makefile.am
+++ b/plugins/rudp/Makefile.am
@@ -125,4 +125,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/sbus/Makefile.am b/plugins/sbus/Makefile.am
index 5a899e74de..e69c9cd86d 100644
--- a/plugins/sbus/Makefile.am
+++ b/plugins/sbus/Makefile.am
@@ -123,4 +123,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/sercosiii/Makefile.am b/plugins/sercosiii/Makefile.am
index 574912ceee..3b852fb009 100644
--- a/plugins/sercosiii/Makefile.am
+++ b/plugins/sercosiii/Makefile.am
@@ -126,4 +126,4 @@ EXTRA_DIST = \
 
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am
index 6c60e3c8ba..0fa7771319 100644
--- a/plugins/stats_tree/Makefile.am
+++ b/plugins/stats_tree/Makefile.am
@@ -57,4 +57,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am
index 9092aa92e3..c251f8e163 100644
--- a/plugins/tpg/Makefile.am
+++ b/plugins/tpg/Makefile.am
@@ -64,7 +64,7 @@ EXTRA_DIST = \
 	http.tpg \
 	Makefile.nmake
 
-TPG = ../../tools/tpg
+TPG = $(top_builddir)/tools/tpg
 
 http-parser.h: http-parser.c
 
@@ -75,4 +75,4 @@ http-parser.c: http.tpg $(TPG)/tpg.pl $(TPG)/TPG.pm
 	$(PERL) -I$(TPG) $(TPG)/tpg.pl http.tpg
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am
index 84122c3ef0..b8943e72af 100644
--- a/plugins/unistim/Makefile.am
+++ b/plugins/unistim/Makefile.am
@@ -126,4 +126,4 @@ EXTRA_DIST = \
 
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/v5ua/Makefile.am b/plugins/v5ua/Makefile.am
index 77a7a592b0..caa780dd23 100644
--- a/plugins/v5ua/Makefile.am
+++ b/plugins/v5ua/Makefile.am
@@ -124,4 +124,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am
index 67e275001a..1b4004f84d 100644
--- a/plugins/wimax/Makefile.am
+++ b/plugins/wimax/Makefile.am
@@ -125,4 +125,4 @@ EXTRA_DIST = \
 	plugin.rc.in
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am
index e88d7aae81..d1a5dd4935 100644
--- a/plugins/wimaxasncp/Makefile.am
+++ b/plugins/wimaxasncp/Makefile.am
@@ -23,7 +23,7 @@
 #
 
 # lex rules
-include ../../Makefile.am.inc
+include $(top_srcdir)/Makefile.am.inc
 
 INCLUDES = -I$(top_srcdir) -I$(includedir)
 
@@ -145,4 +145,4 @@ wimaxasncpdir = $(pkgdatadir)/wimaxasncp
 
 
 checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
+	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)