small formatting/automake cleanups

SVN revision: 53327

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 74c78ef..4d80c82 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -2,20 +2,21 @@ SUBDIRS = e_fm
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = -I$(top_builddir) \
-           -I$(top_srcdir) \
-          -I$(top_srcdir)/src/bin \
-          -I$(top_srcdir)/src/lib \
-          @e_cflags@ \
-          @x_cflags@ \
-          @cf_cflags@ \
-          @VALGRIND_CFLAGS@ \
-          @EDJE_DEF@ \
-          -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
-          -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
-          -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
-          -DLOCALE_DIR=\"@LOCALE_DIR@\" \
-          -DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\"
+INCLUDES = \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/bin \
+-I$(top_srcdir)/src/lib \
+@e_cflags@ \
+@x_cflags@ \
+@cf_cflags@ \
+@VALGRIND_CFLAGS@ \
+@EDJE_DEF@ \
+-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
+-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
+-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
+-DLOCALE_DIR=\"@LOCALE_DIR@\" \
+-DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\"
 
 bin_PROGRAMS = \
 enlightenment \

diff --git a/src/bin/e_fm/Makefile.am b/src/bin/e_fm/Makefile.am
index 3851427..50199d6 100644 (file)
--- a/src/bin/e_fm/Makefile.am
+++ b/src/bin/e_fm/Makefile.am
@@ -1,19 +1,20 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = -I$(top_builddir) \
-           -I$(top_srcdir) \
-          -I$(top_srcdir)/src/bin \
-          -I$(top_srcdir)/src/lib \
-          @e_cflags@ \
-          @x_cflags@ \
-          @cf_cflags@ \
-          @VALGRIND_CFLAGS@ \
-          @EDJE_DEF@ \
-          -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
-          -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
-          -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
-          -DLOCALE_DIR=\"@LOCALE_DIR@\" \
-          -DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\"
+AM_CFLAGS = \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/bin \
+-I$(top_srcdir)/src/lib \
+@e_cflags@ \
+@x_cflags@ \
+@cf_cflags@ \
+@VALGRIND_CFLAGS@ \
+@EDJE_DEF@ \
+-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
+-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
+-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
+-DLOCALE_DIR=\"@LOCALE_DIR@\" \
+-DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\"
 
 internal_bindir = $(libdir)/enlightenment/utils
 internal_bin_PROGRAMS = \
@@ -29,6 +30,4 @@ e_fm_ipc.c \
 ../e_sha1.c
 
 enlightenment_fm_LDADD = @E_FM_LIBS@
-enlightenment_fm_CFLAGS = $(INCLUDES)
-