diff options
| -rw-r--r-- | lib/Makefile.am | 14 | ||||
| -rw-r--r-- | lib/ephy-nss-glue.c (renamed from src/ephy-nss-glue.c) | 0 | ||||
| -rw-r--r-- | lib/ephy-nss-glue.h (renamed from src/ephy-nss-glue.h) | 0 | ||||
| -rw-r--r-- | lib/ephy-profile-migration.c (renamed from src/ephy-profile-migration.c) | 0 | ||||
| -rw-r--r-- | lib/ephy-profile-migration.h (renamed from src/ephy-profile-migration.h) | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 16 |
6 files changed, 15 insertions, 15 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 3ea7e1c07..58c363a73 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -20,6 +20,7 @@ NOINST_H_FILES = \ ephy-node-common.h \ ephy-object-helpers.h \ ephy-prefs.h \ + ephy-profile-migration.h \ ephy-print-utils.h \ ephy-shlib-loader.h \ ephy-signal-accumulator.h \ @@ -57,6 +58,7 @@ libephymisc_la_SOURCES = \ ephy-node-db.c \ ephy-object-helpers.c \ ephy-prefs.h \ + ephy-profile-migration.c \ ephy-print-utils.c \ ephy-shlib-loader.c \ ephy-signal-accumulator.c \ @@ -98,6 +100,18 @@ 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) + +libephymisc_la_CFLAGS += $(NSS_CFLAGS) +endif # ENABLE_NSS + BUILT_SOURCES = \ ephy-lib-type-builtins.c \ ephy-lib-type-builtins.h \ diff --git a/src/ephy-nss-glue.c b/lib/ephy-nss-glue.c index e1c65b6c0..e1c65b6c0 100644 --- a/src/ephy-nss-glue.c +++ b/lib/ephy-nss-glue.c diff --git a/src/ephy-nss-glue.h b/lib/ephy-nss-glue.h index 0c157226a..0c157226a 100644 --- a/src/ephy-nss-glue.h +++ b/lib/ephy-nss-glue.h diff --git a/src/ephy-profile-migration.c b/lib/ephy-profile-migration.c index c0c319d04..c0c319d04 100644 --- a/src/ephy-profile-migration.c +++ b/lib/ephy-profile-migration.c diff --git a/src/ephy-profile-migration.h b/lib/ephy-profile-migration.h index 51114a88d..51114a88d 100644 --- a/src/ephy-profile-migration.h +++ b/lib/ephy-profile-migration.h diff --git a/src/Makefile.am b/src/Makefile.am index c8bc0d44a..2ba6f2392 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,6 @@ NOINST_H_FILES = \ ephy-location-action.h \ ephy-navigation-action.h \ ephy-password-info.h \ - ephy-profile-migration.h \ ephy-tabs-menu.h \ ephy-toolbars-model.h \ ephy-toolbar.h \ @@ -75,8 +74,7 @@ libephymain_la_SOURCES = \ ephy-lockdown.c \ ephy-navigation-action.c \ ephy-notebook.c \ - ephy-password-info.c \ - ephy-profile-migration.c \ + ephy-password-info.c \ ephy-session.c \ ephy-shell.c \ ephy-statusbar.c \ @@ -140,18 +138,6 @@ libephymain_la_SOURCES += \ libephymain_la_CFLAGS += $(SEED_CFLAGS) endif # ENABLE_SEED -if ENABLE_NSS -NOINST_H_FILES += \ - ephy-nss-glue.h \ - $(NULL) - -libephymain_la_SOURCES += \ - ephy-nss-glue.c - $(NULL) - -libephymain_la_CFLAGS += $(NSS_CFLAGS) -endif # ENABLE_NSS - epiphany_SOURCES = ephy-main.c epiphany_CPPFLAGS = \ |