[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32578 - in gnunet-gtk/src: conversation fs identity lib pe
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32578 - in gnunet-gtk/src: conversation fs identity lib peerinfo setup statistics |
Date: |
Fri, 7 Mar 2014 09:25:21 +0100 |
Author: grothoff
Date: 2014-03-07 09:25:21 +0100 (Fri, 07 Mar 2014)
New Revision: 32578
Modified:
gnunet-gtk/src/conversation/Makefile.am
gnunet-gtk/src/fs/Makefile.am
gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
gnunet-gtk/src/identity/Makefile.am
gnunet-gtk/src/lib/Makefile.am
gnunet-gtk/src/peerinfo/Makefile.am
gnunet-gtk/src/setup/Makefile.am
gnunet-gtk/src/statistics/Makefile.am
Log:
-modernize automake rules, fix return value
Modified: gnunet-gtk/src/conversation/Makefile.am
===================================================================
--- gnunet-gtk/src/conversation/Makefile.am 2014-03-07 08:15:58 UTC (rev
32577)
+++ gnunet-gtk/src/conversation/Makefile.am 2014-03-07 08:25:21 UTC (rev
32578)
@@ -1,6 +1,6 @@
SUBDIRS = .
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/ \
-I$(top_srcdir)/src/include \
@GTK_CFLAGS@ \
@@ -13,14 +13,14 @@
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 \
Modified: gnunet-gtk/src/fs/Makefile.am
===================================================================
--- gnunet-gtk/src/fs/Makefile.am 2014-03-07 08:15:58 UTC (rev 32577)
+++ gnunet-gtk/src/fs/Makefile.am 2014-03-07 08:25:21 UTC (rev 32578)
@@ -1,6 +1,6 @@
SUBDIRS = .
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/ \
-I$(top_srcdir)/src/include \
@GTK_CFLAGS@ \
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2014-03-07 08:15:58 UTC
(rev 32577)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2014-03-07 08:25:21 UTC
(rev 32578)
@@ -1310,7 +1310,7 @@
if (NULL == sr)
{
GNUNET_break (0);
- return;
+ return NULL;
}
if (NULL != sr->meta)
is_directory = GNUNET_FS_meta_data_test_for_directory (sr->meta);
Modified: gnunet-gtk/src/identity/Makefile.am
===================================================================
--- gnunet-gtk/src/identity/Makefile.am 2014-03-07 08:15:58 UTC (rev 32577)
+++ gnunet-gtk/src/identity/Makefile.am 2014-03-07 08:25:21 UTC (rev 32578)
@@ -1,6 +1,6 @@
SUBDIRS = .
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/ \
-I$(top_srcdir)/src/include \
@GTK_CFLAGS@ \
@@ -12,12 +12,12 @@
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
Modified: gnunet-gtk/src/lib/Makefile.am
===================================================================
--- gnunet-gtk/src/lib/Makefile.am 2014-03-07 08:15:58 UTC (rev 32577)
+++ gnunet-gtk/src/lib/Makefile.am 2014-03-07 08:25:21 UTC (rev 32578)
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/ \
-I$(top_srcdir)/src/include \
@GTK_CFLAGS@ \
@@ -19,7 +19,7 @@
misc.c \
nls.c \
os_installation.c \
- trayicon.c
+ trayicon.c
libgnunetgtk_la_LIBADD = \
-lgnunetutil $(XLIB) \
@GTK_LIBS@ @GNUNET_LIBS@ @GLADE_LIBS@ $(INTLLIBS)
Modified: gnunet-gtk/src/peerinfo/Makefile.am
===================================================================
--- gnunet-gtk/src/peerinfo/Makefile.am 2014-03-07 08:15:58 UTC (rev 32577)
+++ gnunet-gtk/src/peerinfo/Makefile.am 2014-03-07 08:25:21 UTC (rev 32578)
@@ -1,6 +1,6 @@
SUBDIRS = .
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/ \
-I$(top_srcdir)/src/include \
@GTK_CFLAGS@ \
Modified: gnunet-gtk/src/setup/Makefile.am
===================================================================
--- gnunet-gtk/src/setup/Makefile.am 2014-03-07 08:15:58 UTC (rev 32577)
+++ gnunet-gtk/src/setup/Makefile.am 2014-03-07 08:25:21 UTC (rev 32578)
@@ -1,6 +1,6 @@
SUBDIRS = .
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/ \
-I$(top_srcdir)/src/include
Modified: gnunet-gtk/src/statistics/Makefile.am
===================================================================
--- gnunet-gtk/src/statistics/Makefile.am 2014-03-07 08:15:58 UTC (rev
32577)
+++ gnunet-gtk/src/statistics/Makefile.am 2014-03-07 08:25:21 UTC (rev
32578)
@@ -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 @@
@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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32578 - in gnunet-gtk/src: conversation fs identity lib peerinfo setup statistics,
gnunet <=