[shotwell/wip/autotools: 8/27] build: Move shotwell into include file

From: Jens Georg <jensgeorg src gnome org>
To: commits-list gnome org
Cc:
Subject: [shotwell/wip/autotools: 8/27] build: Move shotwell into include file
Date: Tue, 28 Jun 2016 22:48:55 +0000 (UTC)
commit 06412b14ad6aae01a5c597fc8419877f2ca2fa23
Author: Jens Georg <mail jensge org>
Date:   Wed Jun 29 00:12:31 2016 +0200

    build: Move shotwell into include file
    
    Signed-off-by: Jens Georg <mail jensge org>

 Makefile.am |  226 +----------------------------------------------------------
 common.am   |    5 ++
 shotwell.am |  224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 231 insertions(+), 224 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index fb97b4a..058852e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,227 +34,5 @@ GITIGNOREFILES = \
 
 -include $(top_srcdir)/git.mk
 
-bin_PROGRAMS = shotwell
-shotwell_CFLAGS = \
-       $(SHOTWELL_CFLAGS) \
-       $(UNITY_CFLAGS) \
-       -I$(top_srcdir)/vapi \
-       -D_PREFIX='"$(prefix)"' \
-       -D_VERSION='"$(VERSION)"' \
-       -DGETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \
-       -D_LANG_SUPPORT_DIR='"$(prefix)/share/locale"' \
-       -D_LIBEXECDIR='"$(libexecdir)"' \
-       -D_LIB='"$(libdir)"'
-
-shotwell_LDADD = $(SHOTWELL_LIBS) $(UNITY_LIBS)
-shotwell_VALAFLAGS = --pkg gio-2.0 --pkg gtk+-3.0 --pkg gee-0.8 \
-       --pkg gio-unix-2.0 --pkg sqlite3 --pkg gmodule-2.0 \
-       --vapidir $(top_srcdir)/vapi \
-       --pkg libgphoto2 --pkg posix --pkg LConv --pkg libraw --pkg gexiv2 \
-       --pkg libexif --pkg gudev-1.0 --pkg gstreamer-1.0 \
-       --pkg gstreamer-pbutils-1.0 \
-       -g --enable-checking --target-glib=2.32 --thread --fatal-warnings \
-       --enable-experimental --enable-deprecated \
-       $(UNITY_VALAFLAGS)
-
-if IS_GITVERSION
-shotwell_CFLAGS += -D_GIT_VERSION='"@GITVER@"'
-shotwell_VALAFLAGS += --define=_GITVERSION
-endif
-
-shotwell_SOURCES = \
-       src/unit/Unit.vala \
-       src/util/Util.vala \
-       src/util/file.vala \
-       src/util/image.vala \
-       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 \
-       src/threads/BackgroundJob.vala \
-       src/threads/Semaphore.vala \
-       src/db/Db.vala \
-       src/db/DatabaseTable.vala \
-       src/db/PhotoTable.vala \
-       src/db/EventTable.vala \
-       src/db/TagTable.vala \
-       src/db/TombstoneTable.vala \
-       src/db/VideoTable.vala \
-       src/db/VersionTable.vala \
-       src/db/SavedSearchDBTable.vala \
-       src/editing_tools/EditingTools.vala \
-       src/editing_tools/StraightenTool.vala \
-       src/plugins/Plugins.vala \
-       src/plugins/PublishingInterfaces.vala \
-       src/plugins/SpitInterfaces.vala \
-       src/plugins/TransitionsInterfaces.vala \
-       src/plugins/StandardHostInterface.vala \
-       src/plugins/ManifestWidget.vala \
-       src/plugins/DataImportsInterfaces.vala \
-       src/slideshow/Slideshow.vala \
-       src/slideshow/TransitionEffects.vala \
-       src/photos/Photos.vala \
-       src/photos/PhotoFileAdapter.vala \
-       src/photos/PhotoFileFormat.vala \
-       src/photos/PhotoFileSniffer.vala \
-       src/photos/PhotoMetadata.vala \
-       src/photos/GRaw.vala \
-       src/photos/GdkSupport.vala \
-       src/photos/JfifSupport.vala \
-       src/photos/BmpSupport.vala \
-       src/photos/RawSupport.vala \
-       src/photos/PngSupport.vala \
-       src/photos/TiffSupport.vala \
-       src/publishing/Publishing.vala \
-       src/publishing/PublishingUI.vala \
-       src/publishing/PublishingPluginHost.vala \
-       src/publishing/APIGlue.vala \
-       src/library/Library.vala \
-       src/library/LibraryWindow.vala \
-       src/library/Branch.vala \
-       src/library/TrashSidebarEntry.vala \
-       src/library/OfflineSidebarEntry.vala \
-       src/library/FlaggedSidebarEntry.vala \
-       src/library/LastImportSidebarEntry.vala \
-       src/library/ImportQueueSidebarEntry.vala \
-       src/library/FlaggedPage.vala \
-       src/library/ImportQueuePage.vala \
-       src/library/LastImportPage.vala \
-       src/library/OfflinePage.vala \
-       src/library/TrashPage.vala \
-       src/direct/Direct.vala \
-       src/direct/DirectWindow.vala \
-       src/direct/DirectPhoto.vala \
-       src/direct/DirectPhotoPage.vala \
-       src/direct/DirectView.vala \
-       src/core/Core.vala \
-       src/core/DataCollection.vala \
-       src/core/DataSet.vala \
-       src/core/util.vala \
-       src/core/SourceCollection.vala \
-       src/core/SourceHoldingTank.vala \
-       src/core/DatabaseSourceCollection.vala \
-       src/core/ContainerSourceCollection.vala \
-       src/core/ViewCollection.vala \
-       src/core/DataObject.vala \
-       src/core/Alteration.vala \
-       src/core/DataSource.vala \
-       src/core/DataSourceTypes.vala \
-       src/core/DataView.vala \
-       src/core/DataViewTypes.vala \
-       src/core/Tracker.vala \
-       src/core/SourceInterfaces.vala \
-       src/sidebar/Sidebar.vala \
-       src/sidebar/Branch.vala \
-       src/sidebar/Entry.vala \
-       src/sidebar/Tree.vala \
-       src/sidebar/common.vala \
-       src/events/Events.vala \
-       src/events/Branch.vala \
-       src/events/EventsDirectoryPage.vala \
-       src/events/EventPage.vala \
-       src/events/EventDirectoryItem.vala \
-       src/tags/Tags.vala \
-       src/tags/Branch.vala \
-       src/tags/TagPage.vala \
-       src/tags/HierarchicalTagIndex.vala \
-       src/tags/HierarchicalTagUtilities.vala \
-       src/camera/Camera.vala \
-       src/camera/Branch.vala \
-       src/camera/CameraTable.vala \
-       src/camera/GPhoto.vala \
-       src/camera/ImportPage.vala \
-       src/searches/Searches.vala \
-       src/searches/Branch.vala \
-       src/searches/SearchBoolean.vala \
-       src/searches/SavedSearchPage.vala \
-       src/searches/SavedSearchDialog.vala \
-       src/config/Config.vala \
-       src/config/ConfigurationInterfaces.vala \
-       src/config/GSettingsEngine.vala \
-       src/data_imports/DataImports.vala \
-       src/data_imports/DataImportsPluginHost.vala \
-       src/data_imports/DataImportsUI.vala \
-       src/data_imports/DataImportJob.vala \
-       src/data_imports/DataImportSource.vala \
-       src/folders/Folders.vala \
-       src/folders/Branch.vala \
-       src/folders/Page.vala \
-       src/main.vala \
-       src/AppWindow.vala \
-       src/CollectionPage.vala \
-       src/NaturalCollate.vala \
-       src/Thumbnail.vala \
-       src/ThumbnailCache.vala \
-       src/CheckerboardLayout.vala \
-       src/PhotoPage.vala \
-       src/Page.vala \
-       src/SortedList.vala \
-       src/Dimensions.vala \
-       src/Box.vala \
-       src/Photo.vala \
-       src/Orientation.vala \
-       src/BatchImport.vala \
-       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 \
-       src/PixbufCache.vala \
-       src/CommandManager.vala \
-       src/Commands.vala \
-       src/SlideshowPage.vala \
-       src/LibraryFiles.vala \
-       src/Printing.vala \
-       src/Tag.vala \
-       src/Screensaver.vala \
-       src/Exporter.vala \
-       src/DirectoryMonitor.vala \
-       src/LibraryMonitor.vala \
-       src/VideoSupport.vala \
-       src/Tombstone.vala \
-       src/MetadataWriter.vala \
-       src/Application.vala \
-       src/TimedQueue.vala \
-       src/MediaPage.vala \
-       src/MediaDataRepresentation.vala \
-       src/DesktopIntegration.vala \
-       src/MediaInterfaces.vala \
-       src/MediaMetadata.vala \
-       src/VideoMetadata.vala \
-       src/MediaMonitor.vala \
-       src/PhotoMonitor.vala \
-       src/VideoMonitor.vala \
-       src/SearchFilter.vala \
-       src/MediaViewTracker.vala \
-       src/UnityProgressBar.vala \
-       src/Upgrades.vala \
-       src/.unitize/_UnitInternals.vala \
-       src/.unitize/_UtilInternals.vala \
-       src/.unitize/_ThreadsInternals.vala \
-       src/.unitize/_DbInternals.vala \
-       src/.unitize/_EditingToolsInternals.vala \
-       src/.unitize/_PluginsInternals.vala \
-       src/.unitize/_SlideshowInternals.vala \
-       src/.unitize/_PhotosInternals.vala \
-       src/.unitize/_PublishingInternals.vala \
-       src/.unitize/_LibraryInternals.vala \
-       src/.unitize/_DirectInternals.vala \
-       src/.unitize/_CoreInternals.vala \
-       src/.unitize/_SidebarInternals.vala \
-       src/.unitize/_EventsInternals.vala \
-       src/.unitize/_TagsInternals.vala \
-       src/.unitize/_CameraInternals.vala \
-       src/.unitize/_SearchesInternals.vala \
-       src/.unitize/_ConfigInternals.vala \
-       src/.unitize/_DataImportsInternals.vala \
-       src/.unitize/_FoldersInternals.vala \
-       src/.unitize/_Library_unitize_entry.vala \
-       src/.unitize/_Direct_unitize_entry.vala
+include $(top_srcdir)/common.am
+include $(top_srcdir)/shotwell.am
diff --git a/common.am b/common.am
new file mode 100644
index 0000000..d97b014
--- /dev/null
+++ b/common.am
@@ -0,0 +1,5 @@
+# --enable-checking needs to come first to not trigger
+#  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18734
+COMMON_VALAFLAGS = \
+       --enable-checking -g --target-glib=2.32 --thread --fatal-warnings \
+       --enable-experimental --enable-deprecated
diff --git a/shotwell.am b/shotwell.am
new file mode 100644
index 0000000..cb51ec0
--- /dev/null
+++ b/shotwell.am
@@ -0,0 +1,224 @@
+bin_PROGRAMS = shotwell
+shotwell_CFLAGS = \
+       $(SHOTWELL_CFLAGS) \
+       $(UNITY_CFLAGS) \
+       -I$(top_srcdir)/vapi \
+       -D_PREFIX='"$(prefix)"' \
+       -D_VERSION='"$(VERSION)"' \
+       -DGETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \
+       -D_LANG_SUPPORT_DIR='"$(prefix)/share/locale"' \
+       -D_LIBEXECDIR='"$(libexecdir)"' \
+       -D_LIB='"$(libdir)"'
+
+shotwell_LDADD = $(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 \
+       --vapidir $(top_srcdir)/vapi \
+       --pkg libgphoto2 --pkg posix --pkg LConv --pkg libraw --pkg gexiv2 \
+       --pkg libexif --pkg gudev-1.0 --pkg gstreamer-1.0 \
+       --pkg gstreamer-pbutils-1.0 \
+       $(UNITY_VALAFLAGS) \
+       $(COMMON_VALAFLAGS_POST)
+
+if IS_GITVERSION
+shotwell_CFLAGS += -D_GIT_VERSION='"@GITVER@"'
+shotwell_VALAFLAGS += --define=_GITVERSION
+endif
+
+shotwell_SOURCES = \
+       src/unit/Unit.vala \
+       src/util/Util.vala \
+       src/util/file.vala \
+       src/util/image.vala \
+       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 \
+       src/threads/BackgroundJob.vala \
+       src/threads/Semaphore.vala \
+       src/db/Db.vala \
+       src/db/DatabaseTable.vala \
+       src/db/PhotoTable.vala \
+       src/db/EventTable.vala \
+       src/db/TagTable.vala \
+       src/db/TombstoneTable.vala \
+       src/db/VideoTable.vala \
+       src/db/VersionTable.vala \
+       src/db/SavedSearchDBTable.vala \
+       src/editing_tools/EditingTools.vala \
+       src/editing_tools/StraightenTool.vala \
+       src/plugins/Plugins.vala \
+       src/plugins/PublishingInterfaces.vala \
+       src/plugins/SpitInterfaces.vala \
+       src/plugins/TransitionsInterfaces.vala \
+       src/plugins/StandardHostInterface.vala \
+       src/plugins/ManifestWidget.vala \
+       src/plugins/DataImportsInterfaces.vala \
+       src/slideshow/Slideshow.vala \
+       src/slideshow/TransitionEffects.vala \
+       src/photos/Photos.vala \
+       src/photos/PhotoFileAdapter.vala \
+       src/photos/PhotoFileFormat.vala \
+       src/photos/PhotoFileSniffer.vala \
+       src/photos/PhotoMetadata.vala \
+       src/photos/GRaw.vala \
+       src/photos/GdkSupport.vala \
+       src/photos/JfifSupport.vala \
+       src/photos/BmpSupport.vala \
+       src/photos/RawSupport.vala \
+       src/photos/PngSupport.vala \
+       src/photos/TiffSupport.vala \
+       src/publishing/Publishing.vala \
+       src/publishing/PublishingUI.vala \
+       src/publishing/PublishingPluginHost.vala \
+       src/publishing/APIGlue.vala \
+       src/library/Library.vala \
+       src/library/LibraryWindow.vala \
+       src/library/Branch.vala \
+       src/library/TrashSidebarEntry.vala \
+       src/library/OfflineSidebarEntry.vala \
+       src/library/FlaggedSidebarEntry.vala \
+       src/library/LastImportSidebarEntry.vala \
+       src/library/ImportQueueSidebarEntry.vala \
+       src/library/FlaggedPage.vala \
+       src/library/ImportQueuePage.vala \
+       src/library/LastImportPage.vala \
+       src/library/OfflinePage.vala \
+       src/library/TrashPage.vala \
+       src/direct/Direct.vala \
+       src/direct/DirectWindow.vala \
+       src/direct/DirectPhoto.vala \
+       src/direct/DirectPhotoPage.vala \
+       src/direct/DirectView.vala \
+       src/core/Core.vala \
+       src/core/DataCollection.vala \
+       src/core/DataSet.vala \
+       src/core/util.vala \
+       src/core/SourceCollection.vala \
+       src/core/SourceHoldingTank.vala \
+       src/core/DatabaseSourceCollection.vala \
+       src/core/ContainerSourceCollection.vala \
+       src/core/ViewCollection.vala \
+       src/core/DataObject.vala \
+       src/core/Alteration.vala \
+       src/core/DataSource.vala \
+       src/core/DataSourceTypes.vala \
+       src/core/DataView.vala \
+       src/core/DataViewTypes.vala \
+       src/core/Tracker.vala \
+       src/core/SourceInterfaces.vala \
+       src/sidebar/Sidebar.vala \
+       src/sidebar/Branch.vala \
+       src/sidebar/Entry.vala \
+       src/sidebar/Tree.vala \
+       src/sidebar/common.vala \
+       src/events/Events.vala \
+       src/events/Branch.vala \
+       src/events/EventsDirectoryPage.vala \
+       src/events/EventPage.vala \
+       src/events/EventDirectoryItem.vala \
+       src/tags/Tags.vala \
+       src/tags/Branch.vala \
+       src/tags/TagPage.vala \
+       src/tags/HierarchicalTagIndex.vala \
+       src/tags/HierarchicalTagUtilities.vala \
+       src/camera/Camera.vala \
+       src/camera/Branch.vala \
+       src/camera/CameraTable.vala \
+       src/camera/GPhoto.vala \
+       src/camera/ImportPage.vala \
+       src/searches/Searches.vala \
+       src/searches/Branch.vala \
+       src/searches/SearchBoolean.vala \
+       src/searches/SavedSearchPage.vala \
+       src/searches/SavedSearchDialog.vala \
+       src/config/Config.vala \
+       src/config/ConfigurationInterfaces.vala \
+       src/config/GSettingsEngine.vala \
+       src/data_imports/DataImports.vala \
+       src/data_imports/DataImportsPluginHost.vala \
+       src/data_imports/DataImportsUI.vala \
+       src/data_imports/DataImportJob.vala \
+       src/data_imports/DataImportSource.vala \
+       src/folders/Folders.vala \
+       src/folders/Branch.vala \
+       src/folders/Page.vala \
+       src/main.vala \
+       src/AppWindow.vala \
+       src/CollectionPage.vala \
+       src/NaturalCollate.vala \
+       src/Thumbnail.vala \
+       src/ThumbnailCache.vala \
+       src/CheckerboardLayout.vala \
+       src/PhotoPage.vala \
+       src/Page.vala \
+       src/SortedList.vala \
+       src/Dimensions.vala \
+       src/Box.vala \
+       src/Photo.vala \
+       src/Orientation.vala \
+       src/BatchImport.vala \
+       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 \
+       src/PixbufCache.vala \
+       src/CommandManager.vala \
+       src/Commands.vala \
+       src/SlideshowPage.vala \
+       src/LibraryFiles.vala \
+       src/Printing.vala \
+       src/Tag.vala \
+       src/Screensaver.vala \
+       src/Exporter.vala \
+       src/DirectoryMonitor.vala \
+       src/LibraryMonitor.vala \
+       src/VideoSupport.vala \
+       src/Tombstone.vala \
+       src/MetadataWriter.vala \
+       src/Application.vala \
+       src/TimedQueue.vala \
+       src/MediaPage.vala \
+       src/MediaDataRepresentation.vala \
+       src/DesktopIntegration.vala \
+       src/MediaInterfaces.vala \
+       src/MediaMetadata.vala \
+       src/VideoMetadata.vala \
+       src/MediaMonitor.vala \
+       src/PhotoMonitor.vala \
+       src/VideoMonitor.vala \
+       src/SearchFilter.vala \
+       src/MediaViewTracker.vala \
+       src/UnityProgressBar.vala \
+       src/Upgrades.vala \
+       src/.unitize/_UnitInternals.vala \
+       src/.unitize/_UtilInternals.vala \
+       src/.unitize/_ThreadsInternals.vala \
+       src/.unitize/_DbInternals.vala \
+       src/.unitize/_EditingToolsInternals.vala \
+       src/.unitize/_PluginsInternals.vala \
+       src/.unitize/_SlideshowInternals.vala \
+       src/.unitize/_PhotosInternals.vala \
+       src/.unitize/_PublishingInternals.vala \
+       src/.unitize/_LibraryInternals.vala \
+       src/.unitize/_DirectInternals.vala \
+       src/.unitize/_CoreInternals.vala \
+       src/.unitize/_SidebarInternals.vala \
+       src/.unitize/_EventsInternals.vala \
+       src/.unitize/_TagsInternals.vala \
+       src/.unitize/_CameraInternals.vala \
+       src/.unitize/_SearchesInternals.vala \
+       src/.unitize/_ConfigInternals.vala \
+       src/.unitize/_DataImportsInternals.vala \
+       src/.unitize/_FoldersInternals.vala \
+       src/.unitize/_Library_unitize_entry.vala \
+       src/.unitize/_Direct_unitize_entry.vala
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]