-modernize automake rules, fix return value

8 files changed, 19 insertions, 19 deletions

diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 0fade1d1..afddc653 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = .
 
-INCLUDES = \
+AM_CPPFLAGS = \
   -I$(top_srcdir)/ \
   -I$(top_srcdir)/src/include \
   @GTK_CFLAGS@ \
@@ -13,14 +13,14 @@ endif
 
 gnunet_conversation_gtk_SOURCES = \
   gnunet-conversation-gtk.c \
-  gnunet-conversation-gtk.h \ 
+  gnunet-conversation-gtk.h \
   gnunet-conversation-gtk_phone.c \
   gnunet-conversation-gtk_phone.h \
   gnunet-conversation-gtk_contacts.c \
   gnunet-conversation-gtk_contacts.h \
   gnunet-conversation-gtk_history.c \
   gnunet-conversation-gtk_history.h \
-  gnunet-conversation-gtk_about.c 
+  gnunet-conversation-gtk_about.c
 
 gnunet_conversation_gtk_LDADD = \
   $(top_builddir)/src/lib/libgnunetgtk.la \
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 906b2936..dcd4d700 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = .
 
-INCLUDES = \
+AM_CPPFLAGS = \
   -I$(top_srcdir)/ \
   -I$(top_srcdir)/src/include \
   @GTK_CFLAGS@ \
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 04b38119..608a81ba 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -1310,7 +1310,7 @@ search_list_popup (GtkTreeModel *tm,
   if (NULL == sr)
   {
     GNUNET_break (0);
-    return;
+    return NULL;
   }
   if (NULL != sr->meta)
     is_directory = GNUNET_FS_meta_data_test_for_directory (sr->meta);
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index 119908fb..1ba001ac 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = .
 
-INCLUDES = \
+AM_CPPFLAGS = \
   -I$(top_srcdir)/ \
   -I$(top_srcdir)/src/include \
   @GTK_CFLAGS@ \
@@ -12,12 +12,12 @@ bin_PROGRAMS = gnunet-identity-gtk
 gnunet_identity_gtk_SOURCES = \
   gnunet-identity-gtk.c gnunet-identity-gtk.h \
   gnunet-identity-gtk_about.c \
-  gnunet-identity-gtk_advertise.c gnunet-identity-gtk_advertise.h 
+  gnunet-identity-gtk_advertise.c gnunet-identity-gtk_advertise.h
 gnunet_identity_gtk_LDADD = \
   $(top_builddir)/src/lib/libgnunetgtk.la \
   @GTK_LIBS@ \
   @GLADE_LIBS@ @GNUNET_LIBS@ \
   -lgnunetutil -lgnunetidentity -lgnunetfs -lextractor \
-  $(INTLLIBS) 
+  $(INTLLIBS)
 gnunet_identity_gtk_LDFLAGS = \
-  -export-dynamic 
+  -export-dynamic
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 68577c11..b91a87ab 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
   -I$(top_srcdir)/ \
   -I$(top_srcdir)/src/include \
   @GTK_CFLAGS@ \
@@ -19,7 +19,7 @@ libgnunetgtk_la_SOURCES = \
   misc.c \
   nls.c \
   os_installation.c \
-  trayicon.c 
+  trayicon.c
 libgnunetgtk_la_LIBADD = \
  -lgnunetutil $(XLIB) \
   @GTK_LIBS@ @GNUNET_LIBS@ @GLADE_LIBS@ $(INTLLIBS)
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 2565b1e0..624ae4aa 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = .
 
-INCLUDES = \
+AM_CPPFLAGS = \
   -I$(top_srcdir)/ \
   -I$(top_srcdir)/src/include \
   @GTK_CFLAGS@ \
diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am
index 5f3aeb6f..fce1f61f 100644
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = .
 
-INCLUDES = \
+AM_CPPFLAGS = \
   -I$(top_srcdir)/ \
   -I$(top_srcdir)/src/include
 
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index d9f2988a..a1b589e5 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -1,13 +1,13 @@
 SUBDIRS = .
 
-INCLUDES = \
+AM_CPPFLAGS = \
   -I$(top_srcdir)/ \
   -I$(top_srcdir)/src/include \
   @GTK_CFLAGS@ \
   @GNUNET_CFLAGS@ \
   @GLADE_CFLAGS@
 
-bin_PROGRAMS = gnunet-statistics-gtk 
+bin_PROGRAMS = gnunet-statistics-gtk
 
 noinst_PROGRAMS = gtk_statistics_demo
 
@@ -20,15 +20,15 @@ gnunet_statistics_gtk_LDADD = \
   @GTK_LIBS@ \
   @GLADE_LIBS@ @GNUNET_LIBS@ \
   -lgnunetutil -lgnunetstatistics -lgnunetcore -lgnunettransport \
-  $(INTLLIBS) 
+  $(INTLLIBS)
 gnunet_statistics_gtk_LDFLAGS = \
-  -export-dynamic 
+  -export-dynamic
 
 gtk_statistics_demo_SOURCES = \
   gtk_statistics.c gtk_statistics.h gtk_statistics_demo.c
 gtk_statistics_demo_LDADD = \
   @GTK_LIBS@ \
   @GLADE_LIBS@ @GNUNET_LIBS@ -lm \
-  $(INTLLIBS) 
+  $(INTLLIBS)
 gtk_statistics_demo_LDFLAGS = \
-  -export-dynamic 
+  -export-dynamic