Wireshark · Ethereal-dev: [Ethereal-dev] Move -I$(top_srcdir) -I$(top_srcdir)/wiretap to Makefile.am

[Albert Chin <ethereal-dev@xxxxxxxxxxxxxxxxxx>]

CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"

Any reason this is not in Makefile.am? It is more appropriate there.

Against 0.9.14.

-- 
albert chin (china@xxxxxxxxxxxxxxxxxx)

-- snip snip
--- configure.in.orig	Tue Sep  9 17:03:18 2003
+++ configure.in	Tue Sep  9 21:08:02 2003
@@ -138,9 +138,6 @@
 	esac
 fi
 
-CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"
-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"
-
 dnl Look in /usr/local for header files and libraries ?
 dnl XXX FIXME don't include /usr/local if it is already in the system
 dnl search path as this causes gcc 3.2 on Linux to complain about a change
--- Makefile.am.orig	Tue Sep  9 17:03:29 2003
+++ Makefile.am	Tue Sep  9 21:06:54 2003
@@ -912,6 +914,9 @@
 # This automake variable adds to the link-line for the executable
 editcap_LDADD = wiretap/libwiretap.a @GLIB_LIBS@
 mergecap_LDADD = wiretap/libwiretap.a @GLIB_LIBS@
+
+# Common headers
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap
 
 #
 # Build various header files for the X11 dissector.
--- gtk/Makefile.am.orig	Tue Sep  9 21:24:20 2003
+++ gtk/Makefile.am	Tue Sep  9 21:24:58 2003
@@ -206,3 +206,6 @@
 	compat_macros.h \
 	print_mswin.c  \
 	print_mswin.h
+
+# Common headers
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap