1.11.2 → 1.11.3.

[metze/wireshark/wip.git] / wiretap / Makefile.am

diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index f056dc6e2e0326a927d11b269a2f60342c89ef26..3e657565b8e1e0a45608cb68eb0e6c557471a4cd 100644 (file)
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -19,7 +19,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include ../Makefile.am.inc
 
@@ -29,20 +29,22 @@ include Makefile.common
 
 noinst_LTLIBRARIES = libwiretap_generated.la
 lib_LTLIBRARIES = libwiretap.la
-libwiretap_la_LDFLAGS = -version-info 0:1:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+libwiretap_la_LDFLAGS = -version-info 0:3:0 @LDFLAGS_SHAREDLIB@
+
+AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL
 
 if HAVE_WARNINGS_AS_ERRORS
-AM_NON_GENERATED_CFLAGS = -Werror
+AM_NON_GENERATED_CFLAGS += -Werror
 endif
 
-INCLUDES = -I$(srcdir)/..
+AM_CPPFLAGS = -I$(srcdir)/..
 
 CLEANFILES = \
        libwiretap.a            \
        libwiretap.la           \
        libwiretap_generated.a  \
        libwiretap_generated.la \
-       wtap.sym                \
        *~
 
 MAINTAINERCLEANFILES = \
@@ -62,24 +64,28 @@ libwiretap_generated_la_SOURCES = \
        $(GENERATED_C_FILES)
 
 EXTRA_DIST = \
+       README.airmagnet        \
        README.developer        \
        Makefile.common         \
        Makefile.nmake          \
        libwiretap.vcproj       \
-       wtap.def                \
        $(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 wtap.sym
+libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la
 
 RUNLEX = $(top_srcdir)/tools/runlex.sh
 
+k12text_lex.h : k12text.c
+
 ascend_scanner_lex.h : ascend_scanner.c
 
-k12text_lex.h : k12text.c
+ascend_scanner.c: ascend.h
+
+ascend.h: ascend.c
 
-ascend.c ascend.h: ascend.y
+ascend.c: ascend.y
        @if [ -z "$(YACC)" ]; then \
                echo "Neither bison nor byacc has been found"; \
                exit 1; \
@@ -89,15 +95,17 @@ ascend.c ascend.h: ascend.y
 # ABI compliance checker can be obtained from
 # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker
 # Checked using version 1.21.12
-dumpabi: all abi-descriptor.xml
-       rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz; \
-       mkdir abi-check-headers; cp *.h abi-check-headers/; \
-       abi-compliance-checker -l libwiretap -v1 `ls  .libs/libwiretap.so.?.?.?|sed 's/.*\.so\.//'` \
-               -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml && \
-       cp -f abi_dumps/libwiretap/libwiretap_* .libs/; \
-       cd .libs; ln -sf libwiretap_*.abi.tar.gz libwiretap.abi.tar.gz
+dumpabi-libwiretap: all abi-descriptor.xml
+       rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz
+       mkdir abi-check-headers
+       cp *.h ../ws_symbol_export.h abi-check-headers/
+       abi-compliance-checker -l libwiretap -v1 `readlink .libs/libwiretap.so | sed 's/.*\.so\.//'` \
+               -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \
+               cat logs/libwiretap/[0-9]*/log.txt
+       cp -f abi_dumps/libwiretap/libwiretap_* .libs/
+       cd .libs && ln -sf libwiretap_*.abi.tar.gz libwiretap.abi.tar.gz
 
 checkapi:
 ## 'abort' checking disabled for now pending resolution of existing use of g_assert & g_error
 ##     $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES)
-       $(PERL) ../tools/checkAPIs.pl -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES)
+       $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(NONGENERATED_C_FILES) $(GENERATOR_FILES)