diff options
| author | Evan Huus <eapache@gmail.com> | 2014-06-16 11:43:27 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-06-16 20:44:08 +0000 |
| commit | ad97c1eb873e94b701cc3443822a3c7c7204ea5e (patch) | |
| tree | 4889436309a646001d2bdfe82149c2ec59e59c10 /epan/Makefile.am | |
| parent | a279fa7705b9baf3f6c779face3067b722c802b2 (diff) | |
kill unmaintained python bindings
Change-Id: I1fa4f0d76b6b29d2935723b83b5ea7165039c807
Reviewed-on: https://code.wireshark.org/review/2258
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/Makefile.am')
| -rw-r--r-- | epan/Makefile.am | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index 0128e1f4e0..f7c75f5b24 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -33,21 +33,9 @@ wslua_dir = wslua_dist_dir = wslua endif # HAVE_LIBLUA -if HAVE_LIBPY -wspython_lib = wspython/libwspython.la -wspython_dir = wspython -wspython_dist_dir = -py_dissectors_dir = -DPYTHON_DIR=\"@pythondir@\" -else -wspython_lib = -wspython_dir = -wspython_dist_dir = wspython -py_dissectors_dir = -DPYTHONDIR= -endif - -SUBDIRS = crypt ftypes dfilter dissectors wmem $(wslua_dir) $(wspython_dir) +SUBDIRS = crypt ftypes dfilter dissectors wmem $(wslua_dir) -DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir) $(wspython_dist_dir) +DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir) ACLOCAL_AMFLAGS = `../aclocal-flags` @@ -138,7 +126,7 @@ libwireshark_la_LIBADD = \ libwireshark_asmopt.la crypt/libairpdcap.la \ ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ dissectors/libdirtydissectors.la dissectors/libfiledissectors.la \ - wmem/libwmem.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ + wmem/libwmem.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \ ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \ @@ -148,7 +136,7 @@ libwireshark_la_DEPENDENCIES = \ libwireshark_generated.la \ libwireshark_asmopt.la crypt/libairpdcap.la \ ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ - dissectors/libdirtydissectors.la wmem/libwmem.la $(wslua_lib) $(wspython_lib) \ + dissectors/libdirtydissectors.la wmem/libwmem.la $(wslua_lib) \ ${top_builddir}/wsutil/libwsutil.la \ ${top_builddir}/wiretap/libwiretap.la |