100 lines
4.4 KiB
Diff
100 lines
4.4 KiB
Diff
1diff -Naur 1.0.2-orig/Makefile.am 1.0.2-patched/Makefile.am
|
|
--- 1.0.2-orig/Makefile.am 2009-02-03 13:35:56.000000000 +1000
|
|
+++ 1.0.2-patched/Makefile.am 2009-02-03 14:19:36.000000000 +1000
|
|
@@ -253,6 +253,7 @@
|
|
-dlopen plugins/mate/mate.la \
|
|
-dlopen plugins/opcua/opcua.la \
|
|
-dlopen plugins/opsi/opsi.la \
|
|
+ -dlopen plugins/p25/p25cai.la \
|
|
-dlopen plugins/pcli/pcli.la \
|
|
-dlopen plugins/profinet/profinet.la \
|
|
-dlopen plugins/rlm/rlm.la \
|
|
diff -Naur 1.0.2-orig/Makefile.in 1.0.2-patched/Makefile.in
|
|
--- 1.0.2-orig/Makefile.in 2009-02-03 13:35:56.000000000 +1000
|
|
+++ 1.0.2-patched/Makefile.in 2009-02-03 14:19:30.000000000 +1000
|
|
@@ -1,8 +1,8 @@
|
|
-# Makefile.in generated by automake 1.10 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
@@ -146,7 +146,7 @@
|
|
@HAVE_PLUGINS_TRUE@ plugins/irda/irda.la plugins/lwres/lwres.la \
|
|
@HAVE_PLUGINS_TRUE@ plugins/m2m/m2m.la plugins/mate/mate.la \
|
|
@HAVE_PLUGINS_TRUE@ plugins/opcua/opcua.la plugins/opsi/opsi.la \
|
|
-@HAVE_PLUGINS_TRUE@ plugins/pcli/pcli.la \
|
|
+@HAVE_PLUGINS_TRUE@ plugins/p25/p25cai.la plugins/pcli/pcli.la \
|
|
@HAVE_PLUGINS_TRUE@ plugins/profinet/profinet.la \
|
|
@HAVE_PLUGINS_TRUE@ plugins/rlm/rlm.la plugins/rtnet/rtnet.la \
|
|
@HAVE_PLUGINS_TRUE@ plugins/rudp/rudp.la plugins/sbus/sbus.la \
|
|
diff -Naur 1.0.2-orig/Makefile.nmake 1.0.2-patched/Makefile.nmake
|
|
--- 1.0.2-orig/Makefile.nmake 2009-02-03 13:35:56.000000000 +1000
|
|
+++ 1.0.2-patched/Makefile.nmake 2009-02-03 14:19:44.000000000 +1000
|
|
@@ -976,6 +976,7 @@
|
|
xcopy ".\plugins\mate\mate.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
|
|
xcopy ".\plugins\opcua\opcua.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
|
|
xcopy ".\plugins\opsi\opsi.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
|
|
+ xcopy ".\plugins\p25\p25cai.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
|
|
xcopy ".\plugins\pcli\pcli.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
|
|
xcopy ".\plugins\profinet\profinet.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
|
|
xcopy ".\plugins\rlm\rlm.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
|
|
diff -Naur 1.0.2-orig/packaging/nsis/wireshark.nsi 1.0.2-patched/packaging/nsis/wireshark.nsi
|
|
--- 1.0.2-orig/packaging/nsis/wireshark.nsi 2009-02-03 13:35:56.000000000 +1000
|
|
+++ 1.0.2-patched/packaging/nsis/wireshark.nsi 2009-02-03 14:20:56.000000000 +1000
|
|
@@ -792,6 +792,7 @@
|
|
File "..\..\plugins\lwres\lwres.dll"
|
|
File "..\..\plugins\m2m\m2m.dll"
|
|
File "..\..\plugins\opsi\opsi.dll"
|
|
+File "..\..\plugins\p25\p25cai.dll"
|
|
File "..\..\plugins\pcli\pcli.dll"
|
|
File "..\..\plugins\profinet\profinet.dll"
|
|
File "..\..\plugins\rlm\rlm.dll"
|
|
diff -Naur 1.0.2-orig/plugins/Makefile.am 1.0.2-patched/plugins/Makefile.am
|
|
--- 1.0.2-orig/plugins/Makefile.am 2009-02-03 13:35:56.000000000 +1000
|
|
+++ 1.0.2-patched/plugins/Makefile.am 2009-02-03 14:20:09.000000000 +1000
|
|
@@ -38,6 +38,7 @@
|
|
mate \
|
|
opcua \
|
|
opsi \
|
|
+ p25 \
|
|
pcli \
|
|
profinet \
|
|
rlm \
|
|
diff -Naur 1.0.2-orig/plugins/Makefile.nmake 1.0.2-patched/plugins/Makefile.nmake
|
|
--- 1.0.2-orig/plugins/Makefile.nmake 2009-02-03 13:35:56.000000000 +1000
|
|
+++ 1.0.2-patched/plugins/Makefile.nmake 2009-02-03 14:19:56.000000000 +1000
|
|
@@ -77,6 +77,9 @@
|
|
cd opsi
|
|
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
|
|
cd ..
|
|
+ cd p25
|
|
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
|
|
+ cd ..
|
|
cd pcli
|
|
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
|
|
cd ..
|
|
@@ -137,6 +140,7 @@
|
|
xcopy mate\*.dll $(VERSION) /d
|
|
xcopy opcua\*.dll $(VERSION) /d
|
|
xcopy opsi\*.dll $(VERSION) /d
|
|
+ xcopy p25\*.dll $(VERSION) /d
|
|
xcopy pcli\*.dll $(VERSION) /d
|
|
xcopy profinet\*.dll $(VERSION) /d
|
|
xcopy rlm\*.dll $(VERSION) /d
|
|
diff -Naur 1.0.2-orig/packaging/nsis/Makefile.nmake 1.0.2-patched/packaging/nsis/Makefile.nmake
|
|
--- 1.0.2-orig/packaging/nsis/Makefile.nmake 2009-02-03 13:39:01.000000000 +1000
|
|
+++ 1.0.2-patched/packaging/nsis/Makefile.nmake 2009-02-03 14:52:14.000000000 +1000
|
|
@@ -86,6 +86,7 @@
|
|
../../plugins/m2m/m2m.dll \
|
|
../../plugins/mate/mate.dll \
|
|
../../plugins/opsi/opsi.dll \
|
|
+ ../../plugins/p25/p25cai.dll \
|
|
../../plugins/pcli/pcli.dll \
|
|
../../plugins/rlm/rlm.dll \
|
|
../../plugins/rtnet/rtnet.dll \
|