[gftp/autotools: 11/12] Use AM_CPPFLAGS instead deprecated INCLUDE
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gftp/autotools: 11/12] Use AM_CPPFLAGS instead deprecated INCLUDE
- Date: Sun, 29 Sep 2013 23:39:28 +0000 (UTC)
commit 96b9985e3362fb95073c4cc62a5decc4263a67e3
Author: Javier Jardón <jjardon gnome org>
Date: Mon Sep 30 00:34:24 2013 +0100
Use AM_CPPFLAGS instead deprecated INCLUDE
lib/Makefile.am | 2 +-
lib/fsplib/Makefile.am | 2 +-
src/gtk/Makefile.am | 4 ++--
src/text/Makefile.am | 4 ++--
src/uicommon/Makefile.am | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index fafd762..157e1b8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,5 +7,5 @@ libgftp_a_SOURCES=bookmark.c cache.c charset-conv.c config_file.c fsp.c ftps.c \
protocols.c pty.c rfc959.c rfc2068.c sshv2.c sslcommon.c \
socket-connect.c socket-connect-getaddrinfo.c \
socket-connect-gethostbyname.c sockutils.c
-INCLUDES= GLIB_CFLAGS@ @PTHREAD_CFLAGS@ -I../intl -DSHARE_DIR=\"$(datadir)/gftp\"
-DLOCALE_DIR=\"$(datadir)/locale\"
+AM_CPPFLAGS=$(GLIB_CFLAGS) $(PTHREAD_CFLAGS) -DSHARE_DIR=\"$(datadir)/gftp\"
-DLOCALE_DIR=\"$(datadir)/locale\"
noinst_HEADERS=gftp.h ftpcommon.h httpcommon.h options.h
diff --git a/lib/fsplib/Makefile.am b/lib/fsplib/Makefile.am
index 9d5003d..d7d0d61 100644
--- a/lib/fsplib/Makefile.am
+++ b/lib/fsplib/Makefile.am
@@ -2,5 +2,5 @@
noinst_LIBRARIES = libfsp.a
libfsp_a_SOURCES=fsplib.c lock.c
-INCLUDES=-DFSP_USE_SHAREMEM_AND_SEMOP=1
+AM_CPPFLAGS=-DFSP_USE_SHAREMEM_AND_SEMOP=1
noinst_HEADERS=fsplib.h lock.h
diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index 39d7f1c..69d0a99 100644
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -5,6 +5,6 @@ EXTRA_PROGRAMS = gftp-gtk
gftp_gtk_SOURCES = bookmarks.c chmod_dialog.c delete_dialog.c dnd.c \
gftp-gtk.c gtkui.c gtkui_transfer.c menu-items.c \
misc-gtk.c options_dialog.c transfer.c view_dialog.c
-INCLUDES = @GTK_CFLAGS@ @PTHREAD_CFLAGS@ -I../../intl
-LDADD = ../../lib/libgftp.a ../../lib/fsplib/libfsp.a ../uicommon/libgftpui.a @GTK_LIBS@ @PTHREAD_LIBS@
@EXTRA_LIBS@ @SSL_LIBS@ @LIBINTL@
+AM_CPPFLAGS = $(GTK_CFLAGS) $(PTHREAD_CFLAGS)
+LDADD = ../../lib/libgftp.a ../../lib/fsplib/libfsp.a ../uicommon/libgftpui.a @GTK_LIBS@ @PTHREAD_LIBS@
@EXTRA_LIBS@ @SSL_LIBS@
noinst_HEADERS = gftp-gtk.h
diff --git a/src/text/Makefile.am b/src/text/Makefile.am
index f4b3916..42e089e 100644
--- a/src/text/Makefile.am
+++ b/src/text/Makefile.am
@@ -3,7 +3,7 @@
bin_PROGRAMS = @GFTP_TEXT@
EXTRA_PROGRAMS = gftp-text
gftp_text_SOURCES=gftp-text.c textui.c
-INCLUDES= GLIB_CFLAGS@ -I../../intl
-LDADD = ../../lib/libgftp.a ../../lib/fsplib/libfsp.a ../uicommon/libgftpui.a @GLIB_LIBS@ @EXTRA_LIBS@
@READLINE_LIBS@ @SSL_LIBS@ @LIBINTL@
+AM_CPPFLAGS=$(GLIB_CFLAGS)
+LDADD = ../../lib/libgftp.a ../../lib/fsplib/libfsp.a ../uicommon/libgftpui.a @GLIB_LIBS@ @EXTRA_LIBS@
@READLINE_LIBS@ @SSL_LIBS@
noinst_HEADERS=gftp-text.h
localedir=$(datadir)/locale
diff --git a/src/uicommon/Makefile.am b/src/uicommon/Makefile.am
index 97aace4..8c0907f 100644
--- a/src/uicommon/Makefile.am
+++ b/src/uicommon/Makefile.am
@@ -2,6 +2,6 @@
noinst_LIBRARIES = libgftpui.a
libgftpui_a_SOURCES = gftpui.c gftpuicallbacks.c
-INCLUDES = @GLIB_CFLAGS@ @PTHREAD_CFLAGS@ -I../intl
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(PTHREAD_CFLAGS)
noinst_HEADERS = gftpui.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]