diff options
| author | Diego Escalante Urrelo <descalante@igalia.com> | 2010-12-07 03:49:27 +0800 |
|---|---|---|
| committer | Diego Escalante Urrelo <descalante@igalia.com> | 2010-12-07 19:20:02 +0800 |
| commit | 4a8a0f51849d8414cadfdeb5527820c4a689343a (patch) | |
| tree | 6e56e92032376059f5578e67176a70ce62c221fe /lib/Makefile.am | |
| parent | e691b408355ec7789fe07c93f6c2376660c44486 (diff) | |
| download | gsoc2013-epiphany-4a8a0f51849d8414cadfdeb5527820c4a689343a.tar gsoc2013-epiphany-4a8a0f51849d8414cadfdeb5527820c4a689343a.tar.gz gsoc2013-epiphany-4a8a0f51849d8414cadfdeb5527820c4a689343a.tar.bz2 gsoc2013-epiphany-4a8a0f51849d8414cadfdeb5527820c4a689343a.tar.lz gsoc2013-epiphany-4a8a0f51849d8414cadfdeb5527820c4a689343a.tar.xz gsoc2013-epiphany-4a8a0f51849d8414cadfdeb5527820c4a689343a.tar.zst gsoc2013-epiphany-4a8a0f51849d8414cadfdeb5527820c4a689343a.zip | |
ephy-profile-migration: separate migration code into another binary
The migration code is now in the ephy-profile-migrator binary, this means:
- epiphany is not linking to NSS anymore
- lib/ephy-profile-migration.c was split into:
+ lib/ephy-profile-migrator.c: the new ephy-profile-migrator binary
+ lib/ephy-profile-utils.c: convenience _ephy_profile_*_form_auth_data functions.
- testing for migration is done without running ephy-profile-migrator
Bug #636685
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index b98c1b37b..f56e59128 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -19,7 +19,7 @@ NOINST_H_FILES = \ ephy-node-common.h \ ephy-object-helpers.h \ ephy-prefs.h \ - ephy-profile-migration.h \ + ephy-profile-utils.h \ ephy-print-utils.h \ ephy-shlib-loader.h \ ephy-signal-accumulator.h \ @@ -57,7 +57,8 @@ libephymisc_la_SOURCES = \ ephy-node-db.c \ ephy-object-helpers.c \ ephy-prefs.h \ - ephy-profile-migration.c \ + ephy-profile-utils.c \ + ephy-profile-utils.h \ ephy-print-utils.c \ ephy-settings.c \ ephy-shlib-loader.c \ @@ -100,18 +101,39 @@ libephymisc_la_LIBADD += \ $(SPELLCHECKER_LIBS) endif -if ENABLE_NSS -NOINST_H_FILES += \ - ephy-nss-glue.h \ - $(NULL) -libephymisc_la_SOURCES += \ - ephy-nss-glue.c - $(NULL) +bin_PROGRAMS = ephy-profile-migrator +ephy_profile_migrator_SOURCES = \ + ephy-profile-migrator.c \ + ephy-profile-utils.c \ + ephy-profile-utils.h \ + ephy-debug.c \ + ephy-debug.h \ + ephy-file-helpers.c \ + ephy-file-helpers.h \ + ephy-settings.c \ + ephy-string.c + +ephy_profile_migrator_CFLAGS = \ + $(DEPENDENCIES_CFLAGS) \ + $(NSS_CFLAGS) \ + $(AM_CFLAGS) + +ephy_profile_migrator_LDADD = \ + $(DEPENDENCIES_LIBS) -libephymisc_la_CFLAGS += $(NSS_CFLAGS) +if ENABLE_NSS +ephy_profile_migrator_SOURCES += \ + ephy-nss-glue.c \ + ephy-nss-glue.h +ephy_profile_migrator_LDADD += $(NSS_LIBS) endif # ENABLE_NSS +ephy_profile_migrator_CPPFLAGS = \ + -I$(top_builddir)/lib \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ + $(AM_CPPFLAGS) + BUILT_SOURCES = \ ephy-lib-type-builtins.c \ ephy-lib-type-builtins.h \ |