diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-21 21:29:18 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-21 21:29:18 +0000 |
| commit | 1a97b58332bfabb285c9322881bbcac23fe66f84 (patch) | |
| tree | 64bc3093cb8c0d6c50abf771a146db58953b479c /tools | |
| parent | 006f022feae2d4ed7a9f43ce792405cc8e0e2b2b (diff) | |
Followup to r45034: Don't define _U_ on the compile line, pull it in from
config.h (like we do in cmake). We always HAVE_CONFIG_H so don't check for it.
svn path=/trunk/; revision=45050
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lemon/Makefile.am | 8 | ||||
| -rw-r--r-- | tools/lemon/Makefile.nmake | 2 | ||||
| -rw-r--r-- | tools/lemon/lemon.c | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/tools/lemon/Makefile.am b/tools/lemon/Makefile.am index 6311155d82..fe931446c2 100644 --- a/tools/lemon/Makefile.am +++ b/tools/lemon/Makefile.am @@ -5,17 +5,17 @@ # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 2001 Gerald Combs -# +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -38,7 +38,7 @@ MAINTAINERCLEANFILES = \ Makefile.in lemon$(EXEEXT): lemon.c - $(CC_FOR_BUILD) -D_U_="" $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $? + $(CC_FOR_BUILD) -I$(top_builddir) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $? EXTRA_DIST = \ cppmagic.h \ diff --git a/tools/lemon/Makefile.nmake b/tools/lemon/Makefile.nmake index cbcf89c169..3b321102b6 100644 --- a/tools/lemon/Makefile.nmake +++ b/tools/lemon/Makefile.nmake @@ -5,7 +5,7 @@ include ..\..\config.nmake -CFLAGS=$(WARNINGS_ARE_ERRORS) -D_U_="" $(LOCAL_CFLAGS) +CFLAGS=$(WARNINGS_ARE_ERRORS) -I..\..\ $(LOCAL_CFLAGS) .c.obj:: $(CC) $(CFLAGS) -Fd.\ -c $< diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c index f075243c23..05830c3911 100644 --- a/tools/lemon/lemon.c +++ b/tools/lemon/lemon.c @@ -28,9 +28,8 @@ ** Updated to sqlite lemon version 1.59 ** $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif + +#include "config.h" #include <stdio.h> #include <stdarg.h> |