diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-06-21 05:06:23 +0100 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-06-30 11:04:17 +0000 |
commit | a16d401b25c85ffb7fde6c46b51cb7048112f885 (patch) | |
tree | 71ba692edcdb6f2a10ed566e18bcfbbc456cfad1 /wiretap | |
parent | f6c5cf953212248cbc680ef0d9b2f852cbfdb951 (diff) |
Remove Makefile.common files
Now that nmake build system has been removed they are not needed anymore.
Change-Id: I88075f955bb4349185859c1af4be22e53de5850f
Reviewed-on: https://code.wireshark.org/review/16050
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wiretap')
-rw-r--r-- | wiretap/Makefile.am | 192 | ||||
-rw-r--r-- | wiretap/Makefile.common | 175 | ||||
-rw-r--r-- | wiretap/README.developer | 2 |
3 files changed, 173 insertions, 196 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index fe1814f71a..edfeb11ef9 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -19,59 +19,211 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -include Makefile.common include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL $(GLIB_CFLAGS) noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la -# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ -CLEANFILES = \ - libwiretap.a \ - libwiretap.la \ - libwiretap_generated.a \ - libwiretap_generated.la \ - *~ +# C source files that are part of the Wiretap source; this includes only +# .c files, not YACC or Lex or... files (as Makefile.nmake maps this list +# into a list of object files by replacing ".c" with ".obj") or files +# generated from YACC or Lex files (as Automake doesn't want them in +# _SOURCES variables). +NONGENERATED_C_FILES = \ + 5views.c \ + aethra.c \ + ascendtext.c \ + atm.c \ + ber.c \ + btsnoop.c \ + camins.c \ + capsa.c \ + catapult_dct2000.c \ + commview.c \ + cosine.c \ + csids.c \ + daintree-sna.c \ + dbs-etherwatch.c \ + dct3trace.c \ + erf.c \ + eyesdn.c \ + file_access.c \ + file_wrappers.c \ + hcidump.c \ + i4btrace.c \ + ipfix.c \ + iptrace.c \ + iseries.c \ + mime_file.c \ + json.c \ + k12.c \ + lanalyzer.c \ + logcat_text.c \ + logcat.c \ + libpcap.c \ + merge.c \ + mpeg.c \ + mplog.c \ + mp2t.c \ + netmon.c \ + netscaler.c \ + netscreen.c \ + nettl.c \ + nettrace_3gpp_32_423.c \ + network_instruments.c \ + netxray.c \ + ngsniffer.c \ + packetlogger.c \ + pcap-common.c \ + pcapng.c \ + peekclassic.c \ + peektagged.c \ + pppdump.c \ + radcom.c \ + snoop.c \ + stanag4607.c \ + tnef.c \ + toshiba.c \ + visual.c \ + vms.c \ + vwr.c \ + wtap.c \ + wtap_opttypes.c -DISTCLEANFILES = \ - ws_version_info.c +# Header files that are not generated from other files +NONGENERATED_HEADER_FILES = \ + 5views.h \ + aethra.h \ + ascendtext.h \ + ascend-int.h \ + atm.h \ + ber.h \ + btsnoop.h \ + camins.h \ + capsa.h \ + catapult_dct2000.h \ + commview.h \ + cosine.h \ + csids.h \ + daintree-sna.h \ + dbs-etherwatch.h \ + dct3trace.h \ + erf.h \ + eyesdn.h \ + file_wrappers.h \ + hcidump.h \ + i4btrace.h \ + i4b_trace.h \ + ipfix.h \ + iptrace.h \ + iseries.h \ + json.h \ + mime_file.h \ + k12.h \ + lanalyzer.h \ + libpcap.h \ + logcat.h \ + logcat_text.h \ + merge.h \ + mpeg.h \ + mplog.h \ + mp2t.h \ + netmon.h \ + netscreen.h \ + netscaler.h \ + nettl.h \ + nettrace_3gpp_32_423.h \ + network_instruments.h \ + netxray.h \ + ngsniffer.h \ + packetlogger.h \ + pcap-common.h \ + pcap-encap.h \ + pcapng.h \ + pcapng_module.h \ + peekclassic.h \ + peektagged.h \ + pppdump.h \ + radcom.h \ + snoop.h \ + stanag4607.h \ + tnef.h \ + toshiba.h \ + visual.h \ + vms.h \ + vwr.h \ + wtap.h \ + wtap_opttypes.h \ + wtap-int.h -MAINTAINERCLEANFILES = \ - $(GENERATED_FILES) \ - Makefile.in +# Files that generate compileable files +GENERATOR_FILES = \ + ascend.y \ + ascend_scanner.l \ + k12text.l + +# The C source files they generate. +GENERATED_C_FILES = \ + ascend.c \ + ascend_scanner.c \ + k12text.c + +# The header files that they generate. +GENERATED_HEADER_FILES = \ + ascend.h \ + ascend_scanner_lex.h \ + k12text_lex.h + +# All the generated files. +GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) #Since code generated by lex may trigger gcc warnings, we are now generating two #libraries. A single library is generated with the lex code without the barrier #"stop on warning". An other library is generated from the remaining source #files with the "stop on warning" barrier. libwiretap_la_SOURCES = \ - $(NONGENERATED_C_FILES) \ + $(NONGENERATED_C_FILES) \ $(NONGENERATED_HEADER_FILES) \ ws_version_info.c +# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ + +libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) + +libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la + libwiretap_generated_la_SOURCES = \ $(GENERATED_C_FILES) libwiretap_generated_la_CFLAGS = $(GENERATED_CFLAGS) +CLEANFILES = \ + libwiretap.a \ + libwiretap.la \ + libwiretap_generated.a \ + libwiretap_generated.la \ + *~ + +DISTCLEANFILES = \ + ws_version_info.c + +MAINTAINERCLEANFILES = \ + $(GENERATED_FILES) \ + Makefile.in + BUILT_SOURCES = $(GENERATED_HEADER_FILES) ws_version_info.c EXTRA_DIST = \ .editorconfig \ README.airmagnet \ README.developer \ - Makefile.common \ CMakeLists.txt \ $(GENERATOR_FILES) \ $(GENERATED_FILES) -libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) - -libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la - k12text_lex.h : k12text.c ascend_scanner_lex.h : ascend_scanner.c diff --git a/wiretap/Makefile.common b/wiretap/Makefile.common deleted file mode 100644 index b16aa21bb9..0000000000 --- a/wiretap/Makefile.common +++ /dev/null @@ -1,175 +0,0 @@ -# Makefile.common -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# C source files that are part of the Wiretap source; this includes only -# .c files, not YACC or Lex or... files (as Makefile.nmake maps this list -# into a list of object files by replacing ".c" with ".obj") or files -# generated from YACC or Lex files (as Automake doesn't want them in -# _SOURCES variables). -NONGENERATED_C_FILES = \ - 5views.c \ - aethra.c \ - ascendtext.c \ - atm.c \ - ber.c \ - btsnoop.c \ - camins.c \ - capsa.c \ - catapult_dct2000.c \ - commview.c \ - cosine.c \ - csids.c \ - daintree-sna.c \ - dbs-etherwatch.c \ - dct3trace.c \ - erf.c \ - eyesdn.c \ - file_access.c \ - file_wrappers.c \ - hcidump.c \ - i4btrace.c \ - ipfix.c \ - iptrace.c \ - iseries.c \ - mime_file.c \ - json.c \ - k12.c \ - lanalyzer.c \ - logcat_text.c \ - logcat.c \ - libpcap.c \ - merge.c \ - mpeg.c \ - mplog.c \ - mp2t.c \ - netmon.c \ - netscaler.c \ - netscreen.c \ - nettl.c \ - nettrace_3gpp_32_423.c \ - network_instruments.c \ - netxray.c \ - ngsniffer.c \ - packetlogger.c \ - pcap-common.c \ - pcapng.c \ - peekclassic.c \ - peektagged.c \ - pppdump.c \ - radcom.c \ - snoop.c \ - stanag4607.c \ - tnef.c \ - toshiba.c \ - visual.c \ - vms.c \ - vwr.c \ - wtap.c \ - wtap_opttypes.c - -# Header files that are not generated from other files -NONGENERATED_HEADER_FILES = \ - 5views.h \ - aethra.h \ - ascendtext.h \ - ascend-int.h \ - atm.h \ - ber.h \ - btsnoop.h \ - camins.h \ - capsa.h \ - catapult_dct2000.h \ - commview.h \ - cosine.h \ - csids.h \ - daintree-sna.h \ - dbs-etherwatch.h \ - dct3trace.h \ - erf.h \ - eyesdn.h \ - file_wrappers.h \ - hcidump.h \ - i4btrace.h \ - i4b_trace.h \ - ipfix.h \ - iptrace.h \ - iseries.h \ - json.h \ - mime_file.h \ - k12.h \ - lanalyzer.h \ - libpcap.h \ - logcat.h \ - logcat_text.h \ - merge.h \ - mpeg.h \ - mplog.h \ - mp2t.h \ - netmon.h \ - netscreen.h \ - netscaler.h \ - nettl.h \ - nettrace_3gpp_32_423.h \ - network_instruments.h \ - netxray.h \ - ngsniffer.h \ - packetlogger.h \ - pcap-common.h \ - pcap-encap.h \ - pcapng.h \ - pcapng_module.h \ - peekclassic.h \ - peektagged.h \ - pppdump.h \ - radcom.h \ - snoop.h \ - stanag4607.h \ - tnef.h \ - toshiba.h \ - visual.h \ - vms.h \ - vwr.h \ - wtap.h \ - wtap_opttypes.h \ - wtap-int.h - -# Files that generate compileable files -GENERATOR_FILES = \ - ascend.y \ - ascend_scanner.l \ - k12text.l - -# The C source files they generate. -GENERATED_C_FILES = \ - ascend.c \ - ascend_scanner.c \ - k12text.c - -# The header files that they generate. -GENERATED_HEADER_FILES = \ - ascend.h \ - ascend_scanner_lex.h \ - k12text_lex.h - -# All the generated files. -GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) diff --git a/wiretap/README.developer b/wiretap/README.developer index 06c2712d4e..d4a4e3cd53 100644 --- a/wiretap/README.developer +++ b/wiretap/README.developer @@ -87,4 +87,4 @@ To add the ability to write a new capture file format, you have to: in the "dump_open_table_base[]" entry for that file type. In the wiretap directory, add your source file to CMakelists.txt and -your source and header file to Makefile.common. +your source and header file to Makefile.am. |