/[gentoo-x86]/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch
Gentoo

Contents of /net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download) (as text)
Fri Apr 3 05:44:06 2015 UTC (4 years, 10 months ago) by jer
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +4 -4 lines
File MIME type: text/x-diff
Clean up patches.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A792A613)

1 --- a/configure.ac
2 +++ b/configure.ac
3 @@ -46,16 +46,15 @@
4 ])
5 fi
6
7 -CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
8 -CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
9 -CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
10 -LIBS="$LIBS $WX_LIBS"
11 +#CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
12 +#CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
13 +#CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
14 +#LIBS="$LIBS $WX_LIBS"
15
16 AM_CPPFLAGS="$AM_CPPFLAGS $GL_CFLAGS $GLU_CFLAGS"
17 -AM_LDFLAGS="$AM_LDFLAGS $GL_LIBS $GLU_LIBS"
18 AC_SUBST([AM_CPPFLAGS])
19 AC_SUBST([AM_LDFLAGS])
20 -AC_SUBST([$PREFIX])
21 +#AC_SUBST([$PREFIX])
22
23 AC_OUTPUT
24
25 --- a/src/Makefile.am
26 +++ b/src/Makefile.am
27 @@ -1,8 +1,10 @@
28 -fe3d_CPPFLAGS = -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\""
29 +fe3d_CPPFLAGS = -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\"" @WX_CPPFLAGS@
30 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include
31 bin_PROGRAMS = fe3d
32 fe3d_SOURCES = fe_config.cpp fe_core.cpp fe_draw.cpp fe_events.cpp fe_host.cpp fe_hosts.cpp fe_match.cpp fe_node.cpp fe_os_rgx.cpp fe_port.cpp fe_root_node.cpp fe_tools.cpp geo_cache.cpp gl_util.cpp libfe3d.cpp nmap_parser.cpp tex_cache.cpp wxfe3d_app.cpp wxfe3d_frame.cpp wxfe3d_glcanvas.cpp ui_nmap_ctrl.cpp ./gui/fe3d_ui.cpp ./regexp/Matcher.cpp ./regexp/Pattern.cpp ./regexp/WCMatcher.cpp ./regexp/WCPattern.cpp
33 -
34 +fe3d_CFLAGS = @WX_CFLAGS@
35 +fe3d_CXXFLAGS = @WX_CXXFLAGS_ONLY@
36 +fe3d_LDADD = @GLU_LIBS@ @WX_LIBS@
37 fe3ddir = @datadir@/@PACKAGE@
38 fe3d_imgdir = @datadir@/@PACKAGE@/img
39 fe3d_DATA = $(top_srcdir)/data/*

  ViewVC Help
Powered by ViewVC 1.1.20