[niepce] De-recursify niepce/ui



commit 34085d35df6d13b15d11a84f1bbff5627502d68d
Author: Hubert Figuière <hub figuiere net>
Date:   Tue Sep 16 22:51:42 2014 -0400

    De-recursify niepce/ui

 configure.ac                          |    2 --
 src/niepce/ui/Makefile.am             |    4 +---
 src/niepce/ui/dialogs/Makefile.am     |    3 ---
 src/niepce/ui/filmstripcontroller.cpp |    2 +-
 src/niepce/ui/thumb-view/Makefile.am  |   13 -------------
 5 files changed, 2 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f87b7a7..be8cc22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,8 +180,6 @@ AC_DEFINE_UNQUOTED([NIEPCE_BUILD_CONFIG], ["$NIEPCE_BUILD_CONFIG"], [The string
 
 AC_CONFIG_FILES([
 src/niepce/ui/Makefile
-src/niepce/ui/dialogs/Makefile
-src/niepce/ui/thumb-view/Makefile
 src/niepce/modules/Makefile
 src/niepce/modules/darkroom/Makefile
 src/niepce/modules/interfaces/Makefile
diff --git a/src/niepce/ui/Makefile.am b/src/niepce/ui/Makefile.am
index 702eddc..5a2e2ae 100644
--- a/src/niepce/ui/Makefile.am
+++ b/src/niepce/ui/Makefile.am
@@ -1,7 +1,5 @@
 
 
-DIST_SUBDIRS = thumb-view dialogs
-
 gladefiles = dialogs/preferences.ui \
        dialogs/importdialog.ui \
        dialogs/editlabels.ui \
@@ -10,7 +8,7 @@ gladefiles = dialogs/preferences.ui \
 gladedir = @datarootdir@/niepce/glade/
 glade_DATA = $(gladefiles)
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/ -I$(srcdir)/.. -I$(srcdir)/thumb-view \
+AM_CPPFLAGS = -I$(top_srcdir)/src/ -I$(srcdir)/.. \
        -I$(top_srcdir)/src/ext \
        -DGLADEDIR=\"$(gladedir)\" \
        -DDATADIR=\"$(datadir)\" \
diff --git a/src/niepce/ui/filmstripcontroller.cpp b/src/niepce/ui/filmstripcontroller.cpp
index 4ad08c6..2608ff0 100644
--- a/src/niepce/ui/filmstripcontroller.cpp
+++ b/src/niepce/ui/filmstripcontroller.cpp
@@ -25,7 +25,7 @@
 #include "engine/library/thumbnailnotification.hpp"
 #include "fwk/base/debug.hpp"
 
-#include "eog-thumb-nav.hpp"
+#include "thumb-view/eog-thumb-nav.hpp"
 #include "thumbstripview.hpp"
 #include "filmstripcontroller.hpp"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]