diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
| commit | 2b3f22361da0c1d8e6ce70d71352821758186db7 (patch) | |
| tree | 5d10633b47369b3aa52a05bf889ede0dbe5ee108 /authenticator.am | |
| parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
| parent | dc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'authenticator.am')
| -rw-r--r-- | authenticator.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/authenticator.am b/authenticator.am index abc0fa3..2de83ed 100644 --- a/authenticator.am +++ b/authenticator.am @@ -1,7 +1,7 @@ lib_LTLIBRARIES += plugins/authenticator/libshotwell-authenticator.la dist_noinst_DATA += \ - plugins/authenticator/shotwell/flickr_pin_entry_pane.ui \ + plugins/authenticator/shotwell/tumblr_authentication_pane.ui \ plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml \ plugins/authenticator/shotwell-authenticator.h @@ -38,7 +38,7 @@ MOSTLYCLEANFILES += plugins/authenticator/resource.c AUTHENTICATOR_RESOURCE_DEPS = $(shell $(GLIB_COMPILE_RESOURCES) \ --sourcedir=$(AUTHENTICATOR_RESOURCE_SOURCEDIR) \ - --generate-dependencies $(AUTHENTICATOR_SHOTWELL_RESOURCE_FILE)) + --generate-dependencies $(AUTHENTICATOR_RESOURCE_FILE)) plugins/authenticator/resource.c: $(AUTHENTICATOR_RESOURCE_DEPS) $(AUTHENTICATOR_RESOURCE_FILE) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \ @@ -54,5 +54,7 @@ plugins_authenticator_libshotwell_authenticator_la_SOURCES += \ plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala \ plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala \ plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala \ - plugins/authenticator/shotwell/GoogleAuthenticator.vala + plugins/authenticator/shotwell/GoogleAuthenticator.vala \ + plugins/authenticator/shotwell/OAuth1Authenticator.vala \ + plugins/authenticator/shotwell/TumblrAuthenticator.vala endif |