[nautilus/wip/csoriano/private-to-src] another try

[Carlos Soriano Sánchez <csoriano src gnome org>]

commit 654e1ecda37a2a6eaa81ea6ae0a4c814ff9fe792
Author: Carlos Soriano <csoriano gnome org>
Date:   Fri Apr 22 18:16:48 2016 +0200

    another try

 src/Makefile.am                       |    7 +++++++
 src/nautilus-query.c                  |    2 +-
 test/Makefile.am                      |    5 +----
 test/test-copy.c                      |    6 +++---
 test/test-nautilus-directory-async.c  |    6 +++---
 test/test-nautilus-mime-actions-set.c |    2 +-
 test/test-nautilus-mime-actions.c     |    2 +-
 test/test-nautilus-search-engine.c    |    4 ++--
 test/test.h                           |    2 +-
 9 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c287f59..b69396b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,7 @@ AM_CPPFLAGS =                                                 \
        $(WARNING_CFLAGS)                                       \
        $(EXIF_CFLAGS)                                          \
        $(EXEMPI_CFLAGS)                                        \
+       $(TRACKER_CFLAGS)                                       \
        -DDATADIR=\""$(datadir)"\"                              \
        -DLIBDIR=\""$(libdir)"\"                                \
        -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\"            \
@@ -40,6 +41,10 @@ libnautilus_la_LIBADD =\
        $(EXIF_LIBS) \
        $(EXEMPI_LIBS) \
        $(POPT_LIBS) \
+       $(TRACKER_LIBS) \
+       $(SELINUX_LIBS) \
+       $(top_builddir)/eel/libeel-2.la \
+       $(top_builddir)/libnautilus-extension/libnautilus-extension.la \
        $(NULL)
 
 dbus_built_sources =                                   \
@@ -83,6 +88,8 @@ $(dbus_shell_search_provider_built_sources) : Makefile.am $(top_srcdir)/data/she
 headers =                                      \
        nautilus-search-popover.h               \
        nautilus-special-location-bar.h         \
+       nautilus-query.h                        \
+       nautilus-search-provider.h              \
        $(NULL)
 
 resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir)/resources --generate-dependencies 
$(srcdir)/resources/nautilus.gresource.xml)
diff --git a/src/nautilus-query.c b/src/nautilus-query.c
index 779f109..96cc3a4 100644
--- a/src/nautilus-query.c
+++ b/src/nautilus-query.c
@@ -29,7 +29,7 @@
 
 #include "nautilus-file-utilities.h"
 #include "nautilus-query.h"
-#include "nautilus-private-enum-types.h"
+#include "nautilus-enum-types.h"
 
 struct _NautilusQuery {
         GObject parent;
diff --git a/test/Makefile.am b/test/Makefile.am
index c78212d..9f0bcf0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -12,10 +12,7 @@ AM_CPPFLAGS =\
        $(NULL)
 
 LDADD =\
-       $(top_builddir)/libnautilus-private/libnautilus-private.la \
-       $(BASE_LIBS) \
-       $(COMMON_LIBS) \
-       $(NAUTILUS_LIBS) \
+       $(top_builddir)/src/libnautilus.la \
        $(NULL)
 
 noinst_PROGRAMS =\
diff --git a/test/test-copy.c b/test/test-copy.c
index d9c491e..428eea7 100644
--- a/test/test-copy.c
+++ b/test/test-copy.c
@@ -1,8 +1,8 @@
 #include "test.h"
 
-#include <libnautilus-private/nautilus-file-operations.h>
-#include <libnautilus-private/nautilus-progress-info.h>
-#include <libnautilus-private/nautilus-progress-info-manager.h>
+#include <src/nautilus-file-operations.h>
+#include <src/nautilus-progress-info.h>
+#include <src/nautilus-progress-info-manager.h>
 
 static void
 copy_done (GHashTable *debuting_uris, 
diff --git a/test/test-nautilus-directory-async.c b/test/test-nautilus-directory-async.c
index b551bfe..4fbbb32 100644
--- a/test/test-nautilus-directory-async.c
+++ b/test/test-nautilus-directory-async.c
@@ -1,7 +1,7 @@
 #include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-directory.h>
-#include <libnautilus-private/nautilus-search-directory.h>
-#include <libnautilus-private/nautilus-file.h>
+#include <src/nautilus-directory.h>
+#include <src/nautilus-search-directory.h>
+#include <src/nautilus-file.h>
 #include <unistd.h>
 
 void *client1, *client2;
diff --git a/test/test-nautilus-mime-actions-set.c b/test/test-nautilus-mime-actions-set.c
index 6b576a6..b80c317 100644
--- a/test/test-nautilus-mime-actions-set.c
+++ b/test/test-nautilus-mime-actions-set.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-mime-actions.h>
+#include <src/nautilus-mime-actions.h>
 #include <stdio.h>
 
 static gboolean ready = FALSE;
diff --git a/test/test-nautilus-mime-actions.c b/test/test-nautilus-mime-actions.c
index ff0b5db..761c4a9 100644
--- a/test/test-nautilus-mime-actions.c
+++ b/test/test-nautilus-mime-actions.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-mime-actions.h>
+#include <src/nautilus-mime-actions.h>
 #include <stdio.h>
 
 static gboolean ready = FALSE;
diff --git a/test/test-nautilus-search-engine.c b/test/test-nautilus-search-engine.c
index 5353a4b..f377180 100644
--- a/test/test-nautilus-search-engine.c
+++ b/test/test-nautilus-search-engine.c
@@ -1,5 +1,5 @@
-#include <libnautilus-private/nautilus-search-provider.h>
-#include <libnautilus-private/nautilus-search-engine.h>
+#include <src/nautilus-search-provider.h>
+#include <src/nautilus-search-engine.h>
 #include <gtk/gtk.h>
 
 static void
diff --git a/test/test.h b/test/test.h
index 8bc068f..8d9b8a2 100644
--- a/test/test.h
+++ b/test/test.h
@@ -6,7 +6,7 @@
 
 #include <eel/eel-debug.h>
 #include <eel/eel.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
+#include <src/nautilus-file-utilities.h>
 
 void       test_init                            (int                         *argc,
                                                 char                      ***argv);