diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-10-24 05:30:14 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-10-24 05:30:14 +0000 |
| commit | 3e1dae3c8d7bb7b9d8276ef96b3b3f36e6c86869 (patch) | |
| tree | bdf56d30ae63755d3b33dee50e119a5f97c17fdd /epan/wmem/Makefile.am | |
| parent | c1e2438551e6aafaf0da386f8ff4135e8d20f16f (diff) | |
Make it a little more like the Makefile.am for the ftypes subdirectory.
Get rid of reference to non-existent Custom.common file.
svn path=/trunk/; revision=45751
Diffstat (limited to 'epan/wmem/Makefile.am')
| -rw-r--r-- | epan/wmem/Makefile.am | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am index ef1f93ff48..856463dae2 100644 --- a/epan/wmem/Makefile.am +++ b/epan/wmem/Makefile.am @@ -21,14 +21,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -INCLUDES = -I$(top_srcdir) - -include Makefile.common - if HAVE_WARNINGS_AS_ERRORS AM_CFLAGS = -Werror endif +include Makefile.common + AM_CPPFLAGS = $(LIBWMEM_CFLAGS) noinst_LTLIBRARIES = libwmem.la @@ -43,12 +41,13 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = \ Makefile.in +INCLUDES = -I$(top_srcdir) + libwmem_la_SOURCES = \ $(LIBWMEM_SRC) \ $(LIBWMEM_INCLUDES) EXTRA_DIST = \ - Custom.common \ Makefile.common \ Makefile.nmake @@ -56,7 +55,6 @@ checkapi: $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ $(LIBWMEM_SRC) - # # Editor modelines - http://www.wireshark.org/tools/modelines.html # |