summaryrefslogtreecommitdiff
path: root/shotwell.am
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-07-09 12:10:38 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-07-09 12:10:38 +0200
commit709e2d6f5652ec90c194a4ec2b530bebc6f952cb (patch)
tree496b2f3899e1d5728ee9ae76095cc5056c317447 /shotwell.am
parentf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff)
parent5c8be07095cc04a6d8a95204b0504fd7ab030154 (diff)
Merge branch 'release/0.28.3-1'0.28.3-1
Diffstat (limited to 'shotwell.am')
-rw-r--r--shotwell.am39
1 files changed, 26 insertions, 13 deletions
diff --git a/shotwell.am b/shotwell.am
index bb2c53b..ec6cf0d 100644
--- a/shotwell.am
+++ b/shotwell.am
@@ -4,12 +4,16 @@ shotwell_CFLAGS = \
$(UNITY_CFLAGS) \
$(COMMON_CFLAGS) \
-I$(top_builddir)/plugins \
- -I$(abs_top_srcdir)/plugins
+ -I$(abs_top_srcdir)/plugins \
+ -I$(abs_top_srcdir)/src
+ -I$(abs_top_builddir)/src
shotwell_LDADD = \
src/plugins/libplugin.la \
+ src/libgraphics-processor.la \
$(SHOTWELL_LIBS) \
$(UNITY_LIBS)
+
shotwell_VALAFLAGS = $(COMMON_VALAFLAGS) \
--pkg gio-2.0 --pkg gtk+-3.0 --pkg gee-0.8 \
--pkg gio-unix-2.0 --pkg sqlite3 --pkg gmodule-2.0 \
@@ -34,7 +38,7 @@ shotwell_resource_deps := $(shell $(GLIB_COMPILE_RESOURCES) \
resource.c: org.gnome.Shotwell.gresource.xml $(shotwell_resource_deps)
$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
--sourcedir=$(abs_top_srcdir) \
- --generate $<
+ --generate $(abs_top_srcdir)/org.gnome.Shotwell.gresource.xml
shotwell_SOURCES = \
src/unit/Unit.vala \
@@ -44,7 +48,6 @@ shotwell_SOURCES = \
src/util/misc.vala \
src/util/string.vala \
src/util/system.vala \
- src/util/KeyValueMap.vala \
src/util/ui.vala \
src/threads/Threads.vala \
src/threads/Workers.vala \
@@ -59,7 +62,18 @@ shotwell_SOURCES = \
src/db/VideoTable.vala \
src/db/VersionTable.vala \
src/db/SavedSearchDBTable.vala \
+ src/dialogs/Preferences.vala \
+ src/dialogs/EntryMultiCompletion.vala \
+ src/dialogs/ExportDialog.vala \
+ src/dialogs/TextEntry.vala \
+ src/dialogs/WelcomeDialog.vala \
+ src/dialogs/MultiTextEntryDialog.vala \
+ src/dialogs/AdjustDateTimeDialog.vala \
+ src/dialogs/SetBackground.vala \
+ src/dialogs/ProgressDialog.vala \
+ src/dialogs/SetBackgroundSlideshow.vala \
src/editing_tools/EditingTools.vala \
+ src/editing_tools/RGBHistogramManipulator.vala \
src/editing_tools/StraightenTool.vala \
src/slideshow/Slideshow.vala \
src/slideshow/TransitionEffects.vala \
@@ -84,7 +98,7 @@ shotwell_SOURCES = \
src/publishing/APIGlue.vala \
src/library/Library.vala \
src/library/LibraryWindow.vala \
- src/library/Branch.vala \
+ src/library/LibraryBranch.vala \
src/library/TrashSidebarEntry.vala \
src/library/OfflineSidebarEntry.vala \
src/library/FlaggedSidebarEntry.vala \
@@ -123,22 +137,22 @@ shotwell_SOURCES = \
src/sidebar/Tree.vala \
src/sidebar/common.vala \
src/events/Events.vala \
- src/events/Branch.vala \
+ src/events/EventsBranch.vala \
src/events/EventsDirectoryPage.vala \
src/events/EventPage.vala \
src/events/EventDirectoryItem.vala \
src/tags/Tags.vala \
- src/tags/Branch.vala \
+ src/tags/TagsBranch.vala \
src/tags/TagPage.vala \
src/tags/HierarchicalTagIndex.vala \
src/tags/HierarchicalTagUtilities.vala \
src/camera/Camera.vala \
- src/camera/Branch.vala \
+ src/camera/CameraBranch.vala \
src/camera/CameraTable.vala \
src/camera/GPhoto.vala \
src/camera/ImportPage.vala \
src/searches/Searches.vala \
- src/searches/Branch.vala \
+ src/searches/SearchesBranch.vala \
src/searches/SearchBoolean.vala \
src/searches/SavedSearchPage.vala \
src/searches/SavedSearchDialog.vala \
@@ -151,8 +165,8 @@ shotwell_SOURCES = \
src/data_imports/DataImportJob.vala \
src/data_imports/DataImportSource.vala \
src/folders/Folders.vala \
- src/folders/Branch.vala \
- src/folders/Page.vala \
+ src/folders/FoldersBranch.vala \
+ src/folders/FoldersPage.vala \
src/main.vala \
src/AppWindow.vala \
src/CollectionPage.vala \
@@ -171,9 +185,7 @@ shotwell_SOURCES = \
src/Dialogs.vala \
src/Resources.vala \
src/Debug.vala \
- src/ColorTransformation.vala \
src/Properties.vala \
- src/CustomComponents.vala \
src/Event.vala \
src/International.vala \
src/AppDirs.vala \
@@ -228,4 +240,5 @@ shotwell_SOURCES = \
src/.unitize/_FoldersInternals.vala \
src/.unitize/_Library_unitize_entry.vala \
src/.unitize/_Direct_unitize_entry.vala \
- plugins/shotwell-plugin-dev-1.0.vapi
+ plugins/shotwell-plugin-dev-1.0.vapi \
+ src/shotwell-graphics-processor.vapi