diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-06-26 12:10:36 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-06-26 12:10:36 +0200 |
commit | 5e1df7d11813dfdf3b3f24aaae1707101298e69a (patch) | |
tree | 89d6402b5b46c20c39ed13ddfaca87e84bdeb09d | |
parent | a33900f13f006151b57cd8091827d53573b45832 (diff) | |
download | gnunet-gtk-5e1df7d11813dfdf3b3f24aaae1707101298e69a.tar.gz gnunet-gtk-5e1df7d11813dfdf3b3f24aaae1707101298e69a.zip |
fix ftbfs
-rw-r--r-- | src/conversation/Makefile.am | 2 | ||||
-rw-r--r-- | src/fs/Makefile.am | 1 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 11 | ||||
-rw-r--r-- | src/setup/Makefile.am | 2 |
4 files changed, 3 insertions, 13 deletions
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am index 03bf949b..a3120536 100644 --- a/src/conversation/Makefile.am +++ b/src/conversation/Makefile.am | |||
@@ -38,7 +38,7 @@ gnunet_conversation_gtk_LDADD = \ | |||
38 | $(top_builddir)/src/lib/libgnunetgtk.la \ | 38 | $(top_builddir)/src/lib/libgnunetgtk.la \ |
39 | @GTK_LIBS@ \ | 39 | @GTK_LIBS@ \ |
40 | @GLADE_LIBS@ @GNUNET_LIBS@ \ | 40 | @GLADE_LIBS@ @GNUNET_LIBS@ \ |
41 | -lgnunetutil -lgnunetidentity -lgnunetconversation -lgnunetspeaker -lgnunetmicrophone -lgnunetnamestore -lgnunetdnsparser -lgnunetgnsrecord -lgnunetgns -lgnunetfs -lextractor \ | 41 | -lgnunetutil -lgnunetidentity -lgnunetconversation -lgnunetspeaker -lgnunetmicrophone -lgnunetnamestore -lgnunetgnsrecord -lgnunetgns -lgnunetfs -lextractor \ |
42 | $(INTLLIBS) | 42 | $(INTLLIBS) |
43 | gnunet_conversation_gtk_LDFLAGS = \ | 43 | gnunet_conversation_gtk_LDFLAGS = \ |
44 | -export-dynamic | 44 | -export-dynamic |
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index b011d7ca..6faea619 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -35,7 +35,6 @@ gnunet_fs_gtk_LDADD = \ | |||
35 | -lextractor \ | 35 | -lextractor \ |
36 | -lgnunetutil \ | 36 | -lgnunetutil \ |
37 | -lgnunetarm \ | 37 | -lgnunetarm \ |
38 | -lgnunetdnsparser \ | ||
39 | -lgnunetfs \ | 38 | -lgnunetfs \ |
40 | -lgnunetgns \ | 39 | -lgnunetgns \ |
41 | -lgnunetgnsrecord \ | 40 | -lgnunetgnsrecord \ |
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index e8320eb8..4bd69fc1 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -24,7 +24,7 @@ gnunet_namestore_gtk_LDADD = \ | |||
24 | -lgmodule-2.0 \ | 24 | -lgmodule-2.0 \ |
25 | @GTK_LIBS@ @GNUNET_LIBS@ @GLADE_LIBS@ @QR_LIBS@ \ | 25 | @GTK_LIBS@ @GNUNET_LIBS@ @GLADE_LIBS@ @QR_LIBS@ \ |
26 | $(WINLIBS) \ | 26 | $(WINLIBS) \ |
27 | -lgnunetutil -lgnunetgnsrecord -lgnunetnamestore -lgnunetdnsparser \ | 27 | -lgnunetutil -lgnunetgnsrecord -lgnunetnamestore \ |
28 | -lgnunetidentity \ | 28 | -lgnunetidentity \ |
29 | $(INTLLIBS) | 29 | $(INTLLIBS) |
30 | gnunet_namestore_gtk_CFLAGS = \ | 30 | gnunet_namestore_gtk_CFLAGS = \ |
@@ -89,7 +89,6 @@ libgnunet_plugin_gtk_namestore_box_la_CFLAGS = \ | |||
89 | @GLADE_CFLAGS@ | 89 | @GLADE_CFLAGS@ |
90 | libgnunet_plugin_gtk_namestore_box_la_LIBADD = \ | 90 | libgnunet_plugin_gtk_namestore_box_la_LIBADD = \ |
91 | @GNUNET_LIBS@ \ | 91 | @GNUNET_LIBS@ \ |
92 | -lgnunetdnsparser \ | ||
93 | -lgnunetutil -lgnutls | 92 | -lgnunetutil -lgnutls |
94 | libgnunet_plugin_gtk_namestore_box_la_LDFLAGS = \ | 93 | libgnunet_plugin_gtk_namestore_box_la_LDFLAGS = \ |
95 | $(GN_PLUGIN_LDFLAGS) | 94 | $(GN_PLUGIN_LDFLAGS) |
@@ -102,7 +101,6 @@ libgnunet_plugin_gtk_namestore_cname_la_CFLAGS = \ | |||
102 | @GLADE_CFLAGS@ | 101 | @GLADE_CFLAGS@ |
103 | libgnunet_plugin_gtk_namestore_cname_la_LIBADD = \ | 102 | libgnunet_plugin_gtk_namestore_cname_la_LIBADD = \ |
104 | @GNUNET_LIBS@ \ | 103 | @GNUNET_LIBS@ \ |
105 | -lgnunetdnsparser \ | ||
106 | -lgnunetutil | 104 | -lgnunetutil |
107 | libgnunet_plugin_gtk_namestore_cname_la_LDFLAGS = \ | 105 | libgnunet_plugin_gtk_namestore_cname_la_LDFLAGS = \ |
108 | $(GN_PLUGIN_LDFLAGS) | 106 | $(GN_PLUGIN_LDFLAGS) |
@@ -115,7 +113,6 @@ libgnunet_plugin_gtk_namestore_gns2dns_la_CFLAGS = \ | |||
115 | @GLADE_CFLAGS@ | 113 | @GLADE_CFLAGS@ |
116 | libgnunet_plugin_gtk_namestore_gns2dns_la_LIBADD = \ | 114 | libgnunet_plugin_gtk_namestore_gns2dns_la_LIBADD = \ |
117 | @GNUNET_LIBS@ \ | 115 | @GNUNET_LIBS@ \ |
118 | -lgnunetdnsparser \ | ||
119 | -lgnunetutil | 116 | -lgnunetutil |
120 | libgnunet_plugin_gtk_namestore_gns2dns_la_LDFLAGS = \ | 117 | libgnunet_plugin_gtk_namestore_gns2dns_la_LDFLAGS = \ |
121 | $(GN_PLUGIN_LDFLAGS) | 118 | $(GN_PLUGIN_LDFLAGS) |
@@ -128,7 +125,6 @@ libgnunet_plugin_gtk_namestore_leho_la_CFLAGS = \ | |||
128 | @GLADE_CFLAGS@ | 125 | @GLADE_CFLAGS@ |
129 | libgnunet_plugin_gtk_namestore_leho_la_LIBADD = \ | 126 | libgnunet_plugin_gtk_namestore_leho_la_LIBADD = \ |
130 | @GNUNET_LIBS@ \ | 127 | @GNUNET_LIBS@ \ |
131 | -lgnunetdnsparser \ | ||
132 | -lgnunetutil | 128 | -lgnunetutil |
133 | libgnunet_plugin_gtk_namestore_leho_la_LDFLAGS = \ | 129 | libgnunet_plugin_gtk_namestore_leho_la_LDFLAGS = \ |
134 | $(GN_PLUGIN_LDFLAGS) | 130 | $(GN_PLUGIN_LDFLAGS) |
@@ -141,7 +137,6 @@ libgnunet_plugin_gtk_namestore_mx_la_CFLAGS = \ | |||
141 | @GLADE_CFLAGS@ | 137 | @GLADE_CFLAGS@ |
142 | libgnunet_plugin_gtk_namestore_mx_la_LIBADD = \ | 138 | libgnunet_plugin_gtk_namestore_mx_la_LIBADD = \ |
143 | @GNUNET_LIBS@ \ | 139 | @GNUNET_LIBS@ \ |
144 | -lgnunetdnsparser \ | ||
145 | -lgnunetutil | 140 | -lgnunetutil |
146 | libgnunet_plugin_gtk_namestore_mx_la_LDFLAGS = \ | 141 | libgnunet_plugin_gtk_namestore_mx_la_LDFLAGS = \ |
147 | $(GN_PLUGIN_LDFLAGS) | 142 | $(GN_PLUGIN_LDFLAGS) |
@@ -178,7 +173,6 @@ libgnunet_plugin_gtk_namestore_ptr_la_CFLAGS = \ | |||
178 | @GLADE_CFLAGS@ | 173 | @GLADE_CFLAGS@ |
179 | libgnunet_plugin_gtk_namestore_ptr_la_LIBADD = \ | 174 | libgnunet_plugin_gtk_namestore_ptr_la_LIBADD = \ |
180 | @GNUNET_LIBS@ \ | 175 | @GNUNET_LIBS@ \ |
181 | -lgnunetdnsparser \ | ||
182 | -lgnunetutil | 176 | -lgnunetutil |
183 | libgnunet_plugin_gtk_namestore_ptr_la_LDFLAGS = \ | 177 | libgnunet_plugin_gtk_namestore_ptr_la_LDFLAGS = \ |
184 | $(GN_PLUGIN_LDFLAGS) | 178 | $(GN_PLUGIN_LDFLAGS) |
@@ -191,7 +185,6 @@ libgnunet_plugin_gtk_namestore_soa_la_CFLAGS = \ | |||
191 | @GLADE_CFLAGS@ | 185 | @GLADE_CFLAGS@ |
192 | libgnunet_plugin_gtk_namestore_soa_la_LIBADD = \ | 186 | libgnunet_plugin_gtk_namestore_soa_la_LIBADD = \ |
193 | @GNUNET_LIBS@ \ | 187 | @GNUNET_LIBS@ \ |
194 | -lgnunetdnsparser \ | ||
195 | -lgnunetutil | 188 | -lgnunetutil |
196 | libgnunet_plugin_gtk_namestore_soa_la_LDFLAGS = \ | 189 | libgnunet_plugin_gtk_namestore_soa_la_LDFLAGS = \ |
197 | $(GN_PLUGIN_LDFLAGS) | 190 | $(GN_PLUGIN_LDFLAGS) |
@@ -204,7 +197,6 @@ libgnunet_plugin_gtk_namestore_srv_la_CFLAGS = \ | |||
204 | @GLADE_CFLAGS@ | 197 | @GLADE_CFLAGS@ |
205 | libgnunet_plugin_gtk_namestore_srv_la_LIBADD = \ | 198 | libgnunet_plugin_gtk_namestore_srv_la_LIBADD = \ |
206 | @GNUNET_LIBS@ \ | 199 | @GNUNET_LIBS@ \ |
207 | -lgnunetdnsparser \ | ||
208 | -lgnunetutil | 200 | -lgnunetutil |
209 | libgnunet_plugin_gtk_namestore_srv_la_LDFLAGS = \ | 201 | libgnunet_plugin_gtk_namestore_srv_la_LDFLAGS = \ |
210 | $(GN_PLUGIN_LDFLAGS) | 202 | $(GN_PLUGIN_LDFLAGS) |
@@ -217,7 +209,6 @@ libgnunet_plugin_gtk_namestore_tlsa_la_CFLAGS = \ | |||
217 | @GLADE_CFLAGS@ | 209 | @GLADE_CFLAGS@ |
218 | libgnunet_plugin_gtk_namestore_tlsa_la_LIBADD = \ | 210 | libgnunet_plugin_gtk_namestore_tlsa_la_LIBADD = \ |
219 | @GNUNET_LIBS@ \ | 211 | @GNUNET_LIBS@ \ |
220 | -lgnunetdnsparser \ | ||
221 | -lgnunetutil -lgnutls | 212 | -lgnunetutil -lgnutls |
222 | libgnunet_plugin_gtk_namestore_tlsa_la_LDFLAGS = \ | 213 | libgnunet_plugin_gtk_namestore_tlsa_la_LDFLAGS = \ |
223 | $(GN_PLUGIN_LDFLAGS) | 214 | $(GN_PLUGIN_LDFLAGS) |
diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am index ae658ab7..7f97b4ef 100644 --- a/src/setup/Makefile.am +++ b/src/setup/Makefile.am | |||
@@ -33,7 +33,7 @@ gnunet_setup_LDADD = \ | |||
33 | $(top_builddir)/src/lib/libgnunetgtk.la \ | 33 | $(top_builddir)/src/lib/libgnunetgtk.la \ |
34 | @GTK_LIBS@ @GNUNET_LIBS@ @GLADE_LIBS@ \ | 34 | @GTK_LIBS@ @GNUNET_LIBS@ @GLADE_LIBS@ \ |
35 | $(WINLIBS) \ | 35 | $(WINLIBS) \ |
36 | -lgnunetutil -lgnunetnatauto -lgnunettun \ | 36 | -lgnunetutil -lgnunetnatauto \ |
37 | $(INTLLIBS) | 37 | $(INTLLIBS) |
38 | gnunet_setup_CFLAGS = \ | 38 | gnunet_setup_CFLAGS = \ |
39 | @GTK_CFLAGS@ \ | 39 | @GTK_CFLAGS@ \ |