From 2edd7468b1faeb9137c50da0a62f84b8fffa612c Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Sat, 16 Nov 2013 01:23:30 +0100 Subject: Add local include directories using top_srcdir instead of .. --- engines/Makefile.am | 2 +- examples/Makefile.am | 6 +++--- external/Makefile.am | 2 +- ui/Makefile.am | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/engines/Makefile.am b/engines/Makefile.am index f9bf7eb..da441dc 100644 --- a/engines/Makefile.am +++ b/engines/Makefile.am @@ -21,4 +21,4 @@ western_engine_la_LDFLAGS = -module -avoid-version -export-symbols-regex "rccGet western_engine_la_LIBADD = ../src/librcc.la -AM_CPPFLAGS = -I../src @RCD_INCLUDES@ @LIBGUESS_INCLUDES@ +AM_CPPFLAGS = -I${top_srcdir}/src @RCD_INCLUDES@ @LIBGUESS_INCLUDES@ diff --git a/examples/Makefile.am b/examples/Makefile.am index 8b8a8c3..b57ee9c 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -9,21 +9,21 @@ if HAVE_GTK bin_PROGRAMS+= rcc-gtk-config rcc_gtk_config_SOURCES = rcc-gtk-config.c rcc_gtk_config_LDADD= ../src/librcc.la ../ui/librccgtk.la @GTK1_LIBS@ -rcc_gtk_config_CPPFLAGS = @GTK1_INCLUDES@ -I../src -I../ui +rcc_gtk_config_CPPFLAGS = @GTK1_INCLUDES@ -I${top_srcdir}/src -I${top_srcdir}/ui endif if HAVE_GTK2 bin_PROGRAMS+= rcc-gtk2-config rcc_gtk2_config_SOURCES = rcc-gtk-config.c rcc_gtk2_config_LDADD= ../src/librcc.la ../ui/librccgtk2.la @GTK2_LIBS@ -rcc_gtk2_config_CPPFLAGS = @GTK2_CFLAGS@ -I../src -I../ui +rcc_gtk2_config_CPPFLAGS = @GTK2_CFLAGS@ -I${top_srcdir}/src -I${top_srcdir}/ui endif if HAVE_GTK3 bin_PROGRAMS+= rcc-gtk3-config rcc_gtk3_config_SOURCES = rcc-gtk-config.c rcc_gtk3_config_LDADD=../ui/librccgtk3.la @GTK3_LIBS@ -rcc_gtk3_config_CPPFLAGS = @GTK3_CFLAGS@ -I../src -I../ui +rcc_gtk3_config_CPPFLAGS = @GTK3_CFLAGS@ -I${top_srcdir}/src -I${top_srcdir}/ui endif diff --git a/external/Makefile.am b/external/Makefile.am index 31cec9c..a9a1ac1 100644 --- a/external/Makefile.am +++ b/external/Makefile.am @@ -12,4 +12,4 @@ rccexternal_SOURCES= rccexternal.c compat.h \ rccexternal_LDADD= @GLIB2_LIBS@ @LIBTRANSLATE_LIBS@ @BDB_LIBS@ -AM_CPPFLAGS = @GLIB2_CFLAGS@ @LIBTRANSLATE_CFLAGS@ @BDB_INCLUDES@ -I../src +AM_CPPFLAGS = @GLIB2_CFLAGS@ @LIBTRANSLATE_CFLAGS@ @BDB_INCLUDES@ -I${top_srcdir}/src diff --git a/ui/Makefile.am b/ui/Makefile.am index 82d3113..80151bd 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -16,7 +16,7 @@ librccgtk_la_SOURCES = librccui.c \ gtk.c librccgtk_la_LIBADD = ../src/librcc.la @GTK1_LIBS@ @XML_LIBS@ librccgtk_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@ -librccgtk_la_CPPFLAGS = -I../src @XML_INCLUDES@ @GTK1_INCLUDES@ +librccgtk_la_CPPFLAGS = -I${top_srcdir}/src @XML_INCLUDES@ @GTK1_INCLUDES@ endif if HAVE_GTK2 @@ -28,7 +28,7 @@ librccgtk2_la_SOURCES = librccui.c \ gtk.c librccgtk2_la_LIBADD = ../src/librcc.la @GTK2_LIBS@ @XML_LIBS@ librccgtk2_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@ -librccgtk2_la_CPPFLAGS = -I../src @XML_INCLUDES@ @GTK2_CFLAGS@ +librccgtk2_la_CPPFLAGS = -I${top_srcdir}/src @XML_INCLUDES@ @GTK2_CFLAGS@ endif if HAVE_GTK3 @@ -40,8 +40,8 @@ librccgtk3_la_SOURCES = librccui.c \ gtk.c librccgtk3_la_LIBADD = ../src/librcc.la @GTK3_LIBS@ @XML_LIBS@ librccgtk3_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@ -librccgtk3_la_CPPFLAGS = -I../src @XML_INCLUDES@ @GTK3_CFLAGS@ +librccgtk3_la_CPPFLAGS = -I${top_srcdir}/src @XML_INCLUDES@ @GTK3_CFLAGS@ endif -AM_CPPFLAGS = -I../src @XML_INCLUDES@ +AM_CPPFLAGS = -I${top_srcdir}/src @XML_INCLUDES@ include_HEADERS = librccui.h -- cgit v1.2.1