diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-10-15 11:00:38 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-10-20 05:33:38 +0000 |
| commit | 0a6c51e4a0319ca62fb41664da4eac7482844227 (patch) | |
| tree | ff7a4b06c51cb0d1a0583078d0a99e203aa87ef8 /epan | |
| parent | e6e8b7b662419466a264201a6d08af2dc9a737e9 (diff) | |
autotools: Improve SUBDIRS usage
Change-Id: Ia40970c37f4b60f8b820c334c3c728a0ac33f228
Reviewed-on: https://code.wireshark.org/review/23996
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.am | 14 | ||||
| -rw-r--r-- | epan/dissectors/asn1/Makefile.am | 13 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x721/Makefile.am | 35 |
3 files changed, 11 insertions, 51 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index e1a0993027..ab8570270f 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -24,19 +24,11 @@ include $(top_srcdir)/Makefile.am.inc if HAVE_LIBLUA -wslua_lib = wslua/libwslua.la wslua_dir = wslua -wslua_dist_dir = -else # HAVE_LIBLUA -wslua_lib = -wslua_dir = -wslua_dist_dir = wslua -endif # HAVE_LIBLUA +endif SUBDIRS = compress crypt ftypes dfilter dissectors wmem $(wslua_dir) -DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir) - AM_CPPFLAGS = $(INCLUDEDIRS) -I$(builddir)/wslua $(WS_CPPFLAGS) \ $(GLIB_CFLAGS) $(PCAP_CFLAGS) $(LUA_CFLAGS) $(LIBGNUTLS_CFLAGS) \ $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) \ @@ -315,6 +307,10 @@ libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_BIGSHAREDLIB@ @LDFLAGS_SHAREDLIB@ +if HAVE_LIBLUA +wslua_lib = wslua/libwslua.la +endif + # # Add the object files for missing routines, if any. # diff --git a/epan/dissectors/asn1/Makefile.am b/epan/dissectors/asn1/Makefile.am index 191608a734..9c94673ac9 100644 --- a/epan/dissectors/asn1/Makefile.am +++ b/epan/dissectors/asn1/Makefile.am @@ -128,12 +128,11 @@ SUBDIRS = \ x509if \ x509sat -# x721 doesn't build -DONT_BUILD_SUBDIRS = \ - x721 - -DIST_SUBDIRS = $(SUBDIRS) $(DONT_BUILD_SUBDIRS) - EXTRA_DIST = \ CMakeLists.txt \ - Makefile.inc + Makefile.inc \ + x721/CMakeLists.txt \ + x721/Attribute-ASN1Module.asn \ + x721/ManagedObjectClassesDefinitions.asn \ + x721/Notification-ASN1Module.asn \ + x721/Parameter-ASN1Module.asn diff --git a/epan/dissectors/asn1/x721/Makefile.am b/epan/dissectors/asn1/x721/Makefile.am deleted file mode 100644 index 3bba1491e9..0000000000 --- a/epan/dissectors/asn1/x721/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -# 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. - -include ../Makefile.inc - -#Dummy entry to pass the clean target -PROTOCOL_NAME = dummy - -ASN_FILE_LIST = - -INCLUDED_ASN_FILE_LIST = - -EXTRA_DIST = \ - $(EXTRA_DIST_COMMON) \ - $(ASN_FILE_LIST) \ - $(INCLUDED_ASN_FILE_LIST) \ - Attribute-ASN1Module.asn \ - ManagedObjectClassesDefinitions.asn \ - Notification-ASN1Module.asn \ - Parameter-ASN1Module.asn |