diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-01-02 03:50:19 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-01-02 03:50:19 +0000 |
| commit | ac922ec704b6a4152bcc91bdd866426c44ee1fa9 (patch) | |
| tree | 45fee0e2e36c98902561a333d37df159633a8fef | |
| parent | df007c001d6f78e44ef5a82ed93d1031ef68d1e3 (diff) | |
Try a simpler and hopefully more reliable method of linking.
svn path=/trunk/; revision=46890
| -rw-r--r-- | Makefile.am | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 35e0ebe6b3..827cbb0fbd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,8 +50,7 @@ bin_PROGRAMS = \ @rawshark_bin@ EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \ - randpkt text2pcap dumpcap reordercap rawshark \ - wireshark_c wireshark_cxx + randpkt text2pcap dumpcap reordercap rawshark # # Wireshark configuration files are put in $(pkgdatadir). @@ -370,22 +369,13 @@ wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir) # Ideally we could trigger automatic c++ linking here with # nodist_EXTRA_wireshark_SOURCES = dummy.cpp # Unfortunately that check is done by automake and not configure. -# We do the following to try to avoid c++ linking for Wireshark at +# We do the following to try to avoid using c++ to link Wireshark at # all times. -nodist_EXTRA_wireshark_c_SOURCES = dummy.c -wireshark_c_SOURCES = -wireshark_c_CFLAGS = $(wireshark_CFLAGS) -wireshark_c_LDFLAGS = $(wireshark_LDFLAGS) - -nodist_EXTRA_wireshark_cxx_SOURCES = dummy.cpp -wireshark_cxx_SOURCES = -wireshark_cxx_CFLAGS = $(wireshark_CFLAGS) -wireshark_cxx_LDFLAGS = $(wireshark_LDFLAGS) if HAVE_WIRESHARK_CXX -wireshark_LINK = $(wireshark_cxx_LINK) +wireshark_LINK = $(CXXLINK) else -wireshark_LINK = $(wireshark_c_LINK) +wireshark_LINK = $(LINK) endif if ENABLE_STATIC |