diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | lib/Makefile.am | 30 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/profile-migrator/Makefile.am | 34 | ||||
| -rw-r--r-- | src/profile-migrator/ephy-profile-migrator.c (renamed from lib/ephy-profile-migrator.c) | 0 |
6 files changed, 37 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac index e01cb4f30..a0a695977 100644 --- a/configure.ac +++ b/configure.ac @@ -212,6 +212,7 @@ embed/Makefile embed/web-extension/Makefile src/Makefile src/bookmarks/Makefile +src/profile-migrator/Makefile src/search-provider/Makefile po/Makefile.in tests/Makefile diff --git a/lib/Makefile.am b/lib/Makefile.am index 547aeb13a..72bfed929 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -108,36 +108,6 @@ libephymisc_la_LIBADD = \ $(SQLITE3_LIBS) \ $(WEBKIT2GTK_LIBS) -pkglibexec_PROGRAMS = ephy-profile-migrator - -ephy_profile_migrator_SOURCES = \ - ephy-profile-migrator.c - -ephy_profile_migrator_CFLAGS = \ - $(WARN_CFLAGS) - -ephy_profile_migrator_CPPFLAGS = \ - -I$(top_builddir)/lib \ - -I$(srcdir)/history \ - -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ - -DLOCALEDIR=\"$(localedir)\" \ - $(GLIB_CFLAGS) \ - $(GTK_CFLAGS) \ - $(LIBSECRET_CFLAGS) \ - $(LIBSOUP_CFLAGS) \ - $(WEBKIT2GTK_CFLAGS) - -ephy_profile_migrator_LDADD = \ - libephymisc.la \ - $(GLIB_LIBS) \ - $(GTK_LIBS) \ - $(LIBSECRET_LIBS) \ - $(LIBSOUP_LIBS) \ - $(WEBKIT2GTK_LIBS) - -ephy_profile_migrator_LDFLAGS = \ - $(WARN_LDFLAGS) - BUILT_SOURCES = \ ephy-lib-type-builtins.c \ ephy-lib-type-builtins.h diff --git a/po/POTFILES.in b/po/POTFILES.in index 0ae61c3c0..101764884 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,7 +17,6 @@ lib/ephy-form-auth-data.c lib/ephy-gui.c lib/ephy-langs.c lib/ephy-node.c -lib/ephy-profile-migrator.c lib/ephy-string.c lib/ephy-time-helpers.c lib/ephy-zoom.h @@ -62,5 +61,6 @@ src/resources/passwords-dialog.ui src/resources/prefs-dialog.ui src/resources/prefs-lang-dialog.ui src/resources/shortcuts-dialog.ui +src/profile-migrator/ephy-profile-migrator.c src/search-provider/ephy-search-provider.c src/window-commands.c diff --git a/src/Makefile.am b/src/Makefile.am index 799252cf7..ab94b1139 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = bookmarks . search-provider +SUBDIRS = bookmarks . search-provider profile-migrator pkglib_LTLIBRARIES = libephymain.la diff --git a/src/profile-migrator/Makefile.am b/src/profile-migrator/Makefile.am new file mode 100644 index 000000000..0a06183ff --- /dev/null +++ b/src/profile-migrator/Makefile.am @@ -0,0 +1,34 @@ +pkglibexec_PROGRAMS = ephy-profile-migrator + +ephy_profile_migrator_SOURCES = \ + ephy-profile-migrator.c + +ephy_profile_migrator_CFLAGS = \ + $(WARN_CFLAGS) + +ephy_profile_migrator_CPPFLAGS = \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/lib/history \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ + -DLOCALEDIR=\"$(localedir)\" \ + $(GLIB_CFLAGS) \ + $(GTK_CFLAGS) \ + $(LIBSECRET_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(WEBKIT2GTK_CFLAGS) + +ephy_profile_migrator_LDADD = \ + $(top_builddir)/lib/libephymisc.la \ + $(GLIB_LIBS) \ + $(GTK_LIBS) \ + $(LIBSECRET_LIBS) \ + $(LIBSOUP_LIBS) \ + $(WEBKIT2GTK_LIBS) + +ephy_profile_migrator_LDFLAGS = \ + $(WARN_LDFLAGS) + +CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/lib/ephy-profile-migrator.c b/src/profile-migrator/ephy-profile-migrator.c index 86f543859..86f543859 100644 --- a/lib/ephy-profile-migrator.c +++ b/src/profile-migrator/ephy-profile-migrator.c |