diff options
| author | Stefano Karapetsas <[email protected]> | 2013-07-30 10:09:23 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-07-30 10:09:23 -0700 |
| commit | 95ebd69d2966d331d6e294c8f09fa8b5bf0862ee (patch) | |
| tree | 7930974ceaa80a7627ba21b6edc0990c0d542685 | |
| parent | 7cea830d6bb27cc902c6069d2d8fe1c14b0099cb (diff) | |
| parent | 774f1efd8f6cd3c3499face84553f85e8300f901 (diff) | |
| download | engrampa-95ebd69d2966d331d6e294c8f09fa8b5bf0862ee.tar.bz2 engrampa-95ebd69d2966d331d6e294c8f09fa8b5bf0862ee.tar.xz | |
Merge pull request #22 from infirit/automake-fixes
automake fixes: INCLUDES -> AM_CPPFLAGS
| -rw-r--r-- | caja/Makefile.am | 2 | ||||
| -rw-r--r-- | copy-n-paste/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/commands/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/caja/Makefile.am b/caja/Makefile.am index a2a8ce0..1dd9acb 100644 --- a/caja/Makefile.am +++ b/caja/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DFR_DATADIR=\"$(datadir)\" \ -DMATELOCALEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir) \ diff --git a/copy-n-paste/Makefile.am b/copy-n-paste/Makefile.am index d07144d..f5a2bcb 100644 --- a/copy-n-paste/Makefile.am +++ b/copy-n-paste/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -DGTK_DISABLE_DEPRECATED \ +AM_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \ -UGETTEXT_PACKAGE diff --git a/src/Makefile.am b/src/Makefile.am index 3fd656b..0f6905c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,7 @@ privexecdir = $(libexecdir)/engrampa/ shdir = $(libexecdir)/engrampa/ endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/copy-n-paste/ \ -I$(top_srcdir) \ -I$(top_builddir) \ diff --git a/src/commands/Makefile.am b/src/commands/Makefile.am index b51c338..9228238 100644 --- a/src/commands/Makefile.am +++ b/src/commands/Makefile.am @@ -1,7 +1,7 @@ privexecdir = $(libexecdir)/$(PACKAGE) privexec_PROGRAMS = rpm2cpio -INCLUDES = $(DISABLE_DEPRECATED) $(FR_CFLAGS) +AM_CPPFLAGS = $(DISABLE_DEPRECATED) $(FR_CFLAGS) rpm2cpio_SOURCES = rpm2cpio.c rpm2cpio_LDADD = $(FR_LIBS) |