diff options
| -rw-r--r-- | Makefile.am | 44 | ||||
| -rw-r--r-- | codecs/Makefile.am | 3 | ||||
| -rw-r--r-- | docbook/Makefile.am | 12 | ||||
| -rw-r--r-- | epan/Makefile.am | 3 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.am | 1 | ||||
| -rw-r--r-- | epan/wslua/Makefile.am | 19 | ||||
| -rw-r--r-- | epan/wspython/Makefile.am | 4 | ||||
| -rw-r--r-- | gtk/Makefile.am | 15 | ||||
| -rw-r--r-- | gtk/Makefile.common | 14 | ||||
| -rw-r--r-- | plugins/asn1/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/docsis/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/ethercat/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/giop/Makefile.am | 11 | ||||
| -rw-r--r-- | plugins/gryphon/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/interlink/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/irda/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/m2m/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/mate/Makefile.am | 15 | ||||
| -rw-r--r-- | plugins/opcua/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/profinet/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/sercosiii/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/stats_tree/Makefile.am | 13 | ||||
| -rw-r--r-- | plugins/tpg/Makefile.am | 11 | ||||
| -rw-r--r-- | plugins/unistim/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/wimax/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/wimaxasncp/Makefile.am | 17 | ||||
| -rw-r--r-- | tools/lemon/Makefile.am | 3 |
27 files changed, 182 insertions, 111 deletions
diff --git a/Makefile.am b/Makefile.am index 0b86aebc72..a67e335776 100644 --- a/Makefile.am +++ b/Makefile.am @@ -815,7 +815,49 @@ EXTRA_DIST = \ text2pcap.h \ services \ wireshark.desktop \ - wka.tmpl + wka.tmpl \ + CMakeLists.txt \ + cmakeconfig.h.in \ + wsutil/CMakeLists.txt \ + wiretap/CMakeLists.txt \ + README.cmake \ + ConfigureChecks.cmake \ + cmake/modules/readme.txt \ + cmake/modules/FindLYNX.cmake \ + cmake/modules/FindYACC.cmake \ + cmake/modules/FeatureSummary.cmake \ + cmake/modules/FindADNS.cmake \ + cmake/modules/FindCAP.cmake \ + cmake/modules/UseLemon.cmake \ + cmake/modules/FindPCRE.cmake \ + cmake/modules/FindZLIB.cmake \ + cmake/modules/FindPORTAUDIO.cmake \ + cmake/modules/FindPCAP.cmake \ + cmake/modules/FindSMI.cmake \ + cmake/modules/FindCARES.cmake \ + cmake/modules/FindXSLTPROC.cmake \ + cmake/modules/FindSH.cmake \ + cmake/modules/FindGNUTLS.cmake \ + cmake/modules/FindGCRYPT.cmake \ + cmake/modules/UseMakeDissectorReg.cmake \ + cmake/modules/FindLEX.cmake \ + cmake/modules/FindPYTHON.cmake \ + cmake/modules/FindLUA.cmake \ + cmake/modules/FindYAPP.cmake \ + cmake/modules/FindGEOIP.cmake \ + cmake/modules/FindXMLLINT.cmake \ + cmake/modules/FindSED.cmake \ + cmake/modules/FindGLIB2.cmake \ + cmake/modules/FindHtmlViewer.cmake \ + cmake/modules/FindGTK2.cmake \ + cmake/modules/FindFOP.cmake \ + cmake/modules/LICENSE.txt \ + cmake/modules/CMakeInstallDirs.cmake \ + cmake/modules/CheckCLinkerFlag.cmake \ + cmake/modules/UseMakeTapReg.cmake \ + cmake/modules/FindM.cmake \ + cmake/modules/FindKERBEROS.cmake \ + cmake/modules/FindPOD.cmake install-exec-hook: if HAVE_DUMPCAP_GROUP diff --git a/codecs/Makefile.am b/codecs/Makefile.am index 86cff8debf..0c66ca6a91 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -41,7 +41,8 @@ libcodec_a_SOURCES = \ libcodec_a_DEPENDENCIES = EXTRA_DIST = \ - Makefile.nmake + Makefile.nmake \ + CMakeLists.txt checkapi: $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \ diff --git a/docbook/Makefile.am b/docbook/Makefile.am index 506bf19f90..b10a68f985 100644 --- a/docbook/Makefile.am +++ b/docbook/Makefile.am @@ -246,10 +246,14 @@ release-notes-a4.fo: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl clean-local: -rm -rf $(CLEANDIRS) -# XXX if we actually use automake to build this stuff, most of this shouldn't -# be necessary -EXTRA_DIST=$(WSUG_SOURCE) $(WSDG_SOURCE) $(RELEASE_NOTES_SOURCE) \ - check_svn_version.sh make-wsluarm.pl Makefile.nmake +EXTRA_DIST = \ + $(WSUG_SOURCE) \ + $(WSDG_SOURCE) \ + $(RELEASE_NOTES_SOURCE) \ + check_svn_version.sh \ + make-wsluarm.pl \ + Makefile.nmake \ + CMakeLists.txt MAINTAINERCLEANFILES = \ Makefile.in diff --git a/epan/Makefile.am b/epan/Makefile.am index 7d9f8e799b..c7aa198e92 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -106,7 +106,8 @@ EXTRA_DIST = \ reassemble_test.c \ uat_load.l \ exntest.c \ - doxygen.cfg.in + doxygen.cfg.in \ + CMakeLists.txt CLEANFILES = \ libwireshark.a \ diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index 70e3edeec8..cfe868cb6c 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -43,6 +43,7 @@ libdissectors_la_SOURCES = \ libdissectors_la_CFLAGS = $(AM_CLEAN_CFLAGS) +# XXX - what about the contents of the dcerpc and pidl directories? EXTRA_DIST = \ Custom.nmake \ Makefile.common \ diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am index e2573ab071..566ff24930 100644 --- a/epan/wslua/Makefile.am +++ b/epan/wslua/Makefile.am @@ -77,15 +77,16 @@ MAINTAINERCLEANFILES = \ declare_wslua.h EXTRA_DIST = \ - declare_wslua.h \ - init_wslua.h \ - register_wslua.c \ - taps \ - make-reg.pl \ - template-init.lua \ - make-init-lua.pl \ - make-taps.pl \ - Makefile.nmake + declare_wslua.h \ + init_wslua.h \ + register_wslua.c \ + taps \ + make-reg.pl \ + template-init.lua \ + make-init-lua.pl \ + make-taps.pl \ + Makefile.nmake \ + CMakeLists.txt taps_used = \ ../dissectors/packet-http.h \ diff --git a/epan/wspython/Makefile.am b/epan/wspython/Makefile.am index 8f76bc2fd5..9c298930a4 100644 --- a/epan/wspython/Makefile.am +++ b/epan/wspython/Makefile.am @@ -56,4 +56,6 @@ EXTRA_DIST = \ Makefile.nmake \ register-dissector.py \ wspy_dissector.py \ - wspy_libws.py + wspy_libws.py \ + CMakeLists.txt + diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 29019140df..00f966e217 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -79,3 +79,18 @@ network_icons.h: for icon in bluetooth usb wired wireless ; do \ gdk-pixbuf-csource --raw --name=network_$${icon}_pb_data ../image/toolbar/network_$${icon}_16.png >> $@ ;\ done + +EXTRA_DIST = \ + airpcap_dlg.c \ + airpcap_gui_utils.c \ + capture_if_details_dlg_win32.c \ + capture_if_details_dlg_win32.h \ + doxygen.cfg.in \ + file_dlg_win32.c \ + file_dlg_win32.h \ + main_airpcap_toolbar.c \ + Makefile.common \ + Makefile.nmake \ + print_win32.c \ + print_win32.h \ + CMakeLists.txt diff --git a/gtk/Makefile.common b/gtk/Makefile.common index b7156e4e71..b4ae7640e6 100644 --- a/gtk/Makefile.common +++ b/gtk/Makefile.common @@ -317,17 +317,3 @@ noinst_HEADERS = \ voip_calls_dlg.h \ webbrowser.h -EXTRA_DIST = \ - airpcap_dlg.c \ - airpcap_gui_utils.c \ - capture_if_details_dlg_win32.c \ - capture_if_details_dlg_win32.h \ - doxygen.cfg.in \ - file_dlg_win32.c \ - file_dlg_win32.h \ - main_airpcap_toolbar.c \ - Makefile.common \ - Makefile.nmake \ - print_win32.c \ - print_win32.h - diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am index 8634a9ee9c..acaa8a29f0 100644 --- a/plugins/asn1/Makefile.am +++ b/plugins/asn1/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -120,7 +120,8 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index 2571e36957..afffc52165 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/docsis/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -122,7 +122,8 @@ EXTRA_DIST = \ Makefile.nmake \ moduleinfo.nmake \ plugin.rc.in \ - README + README \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index e7a7f43794..d51a97e518 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -121,7 +121,8 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/giop/Makefile.am b/plugins/giop/Makefile.am index 8058fa5930..7a7c9d456a 100644 --- a/plugins/giop/Makefile.am +++ b/plugins/giop/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am -# Automake file for Wireshark/GIOP subdissectors +# Automake file for Wireshark/GIOP subdissectors # # $Id$ # @@ -9,17 +9,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -63,7 +63,8 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.nmake + Makefile.nmake \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput \ diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index d31bcae813..5289063f97 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -8,17 +8,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -123,7 +123,8 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/interlink/Makefile.am b/plugins/interlink/Makefile.am index b10471869c..110709c6a8 100644 --- a/plugins/interlink/Makefile.am +++ b/plugins/interlink/Makefile.am @@ -8,17 +8,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -123,7 +123,8 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am index f751f30d9b..d172e6b374 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/irda/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -121,7 +121,8 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am index ba293bb4d6..cd7d7bec1c 100644 --- a/plugins/m2m/Makefile.am +++ b/plugins/m2m/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -122,7 +122,8 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 8b0b9cc2ac..92ee3edb98 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -127,11 +127,12 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ mate_grammar.lemon \ - mate_parser.l \ - Makefile.nmake \ - Makefile.common \ + mate_parser.l \ + Makefile.nmake \ + Makefile.common \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt RUNLEX = $(top_srcdir)/tools/runlex.sh diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am index 7292412e86..0dd9d18ac3 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/opcua/Makefile.am @@ -7,17 +7,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -124,7 +124,8 @@ EXTRA_DIST = \ Makefile.nmake \ moduleinfo.nmake \ plugin.rc.in \ - README + README \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am index e999d2d8e8..1c746510c8 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/profinet/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -122,7 +122,8 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/sercosiii/Makefile.am b/plugins/sercosiii/Makefile.am index 9a85b0b596..d0ed285578 100644 --- a/plugins/sercosiii/Makefile.am +++ b/plugins/sercosiii/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -122,7 +122,8 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt checkapi: diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am index 6f2557b178..7a1d6aea60 100644 --- a/plugins/stats_tree/Makefile.am +++ b/plugins/stats_tree/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -51,10 +51,11 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ - Makefile.nmake \ + Makefile.common \ + Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(TAP_SRC) $(TAP_INCLUDES) diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am index aab85ec8d3..8da8254974 100644 --- a/plugins/tpg/Makefile.am +++ b/plugins/tpg/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -61,8 +61,9 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - http.tpg \ - Makefile.nmake + http.tpg \ + Makefile.nmake \ + CMakeLists.txt TPG = $(top_builddir)/tools/tpg diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index 85cf375eb6..2e746d84b8 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -7,17 +7,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -122,7 +122,8 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt checkapi: diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index ce1989f83d..393966c85e 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -122,7 +122,8 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in + plugin.rc.in \ + CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput \ diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index 250bd953b0..e889806f9b 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -6,17 +6,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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. @@ -124,11 +124,12 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - wimaxasncp_dict.l \ - Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ - plugin.rc.in + wimaxasncp_dict.l \ + Makefile.common \ + Makefile.nmake \ + moduleinfo.nmake \ + plugin.rc.in \ + CMakeLists.txt RUNLEX = $(top_srcdir)/tools/runlex.sh diff --git a/tools/lemon/Makefile.am b/tools/lemon/Makefile.am index 2bfe3cf0ac..20d6200e4b 100644 --- a/tools/lemon/Makefile.am +++ b/tools/lemon/Makefile.am @@ -47,5 +47,6 @@ EXTRA_DIST = \ lemonflex-tail.inc \ lempar.c \ Makefile.nmake \ - README + README \ + CMakeLists.txt |