diff options
Diffstat (limited to 'grapher')
| -rw-r--r-- | grapher/Makefile.am | 9 | ||||
| -rw-r--r-- | grapher/Makefile.in | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/grapher/Makefile.am b/grapher/Makefile.am index 21ebd256..73f4cd8c 100644 --- a/grapher/Makefile.am +++ b/grapher/Makefile.am @@ -2,9 +2,12 @@ if BUILD_GRAPHER bin_PROGRAMS = stapgraph man_MANS = stapgraph.1 -stapgraph_CPPFLAGS = -DPKGDATADIR='"${pkgdatadir}"' -stapgraph_CXXFLAGS = $(gtkmm_CFLAGS) -Wall -Werror +# Note that since libglade_CFLAGS/libglade_LIBS variables are a +# "superset" of the gtkmm_CFLAGS/gtkmm_LIBS variabes, we'll just use +# the libglade ones. +stapgraph_CPPFLAGS = -DPKGDATADIR='"${pkgdatadir}"' +stapgraph_CXXFLAGS = $(libglade_CFLAGS) -Wall -Werror stapgraph_SOURCES = grapher.cxx StapParser.cxx Graph.cxx GraphWidget.cxx CairoWidget.cxx -stapgraph_LDADD = $(gtkmm_LIBS) +stapgraph_LDADD = $(libglade_LIBS) dist_pkgdata_DATA = graph-dialog.glade stap-start.glade endif diff --git a/grapher/Makefile.in b/grapher/Makefile.in index c2df5752..16f78dc9 100644 --- a/grapher/Makefile.in +++ b/grapher/Makefile.in @@ -195,6 +195,8 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +libglade_CFLAGS = @libglade_CFLAGS@ +libglade_LIBS = @libglade_LIBS@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -220,10 +222,14 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @BUILD_GRAPHER_TRUE@man_MANS = stapgraph.1 + +# Note that since libglade_CFLAGS/libglade_LIBS variables are a +# "superset" of the gtkmm_CFLAGS/gtkmm_LIBS variabes, we'll just use +# the libglade ones. @BUILD_GRAPHER_TRUE@stapgraph_CPPFLAGS = -DPKGDATADIR='"${pkgdatadir}"' -@BUILD_GRAPHER_TRUE@stapgraph_CXXFLAGS = $(gtkmm_CFLAGS) -Wall -Werror +@BUILD_GRAPHER_TRUE@stapgraph_CXXFLAGS = $(libglade_CFLAGS) -Wall -Werror @BUILD_GRAPHER_TRUE@stapgraph_SOURCES = grapher.cxx StapParser.cxx Graph.cxx GraphWidget.cxx CairoWidget.cxx -@BUILD_GRAPHER_TRUE@stapgraph_LDADD = $(gtkmm_LIBS) +@BUILD_GRAPHER_TRUE@stapgraph_LDADD = $(libglade_LIBS) @BUILD_GRAPHER_TRUE@dist_pkgdata_DATA = graph-dialog.glade stap-start.glade all: all-am |