From b511f12b9b4b063610161f2229b94a24a86be0fc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 23:47:27 +0200 Subject: [PATCH] Rename folder 'src' to 'midori' --- Makefile.am | 2 +- configure.in | 15 ++------------- {src => midori}/Makefile.am | 0 {src => midori}/gjs.c | 0 {src => midori}/gjs.h | 0 {src => midori}/main.c | 0 {src => midori}/main.h | 0 {src => midori}/midori-addons.c | 0 {src => midori}/midori-addons.h | 0 {src => midori}/midori-app.c | 0 {src => midori}/midori-app.h | 0 {src => midori}/midori-browser.c | 0 {src => midori}/midori-browser.h | 0 {src => midori}/midori-console.c | 0 {src => midori}/midori-console.h | 0 {src => midori}/midori-panel.c | 0 {src => midori}/midori-panel.h | 0 {src => midori}/midori-preferences.c | 0 {src => midori}/midori-preferences.h | 0 {src => midori}/midori-trash.c | 0 {src => midori}/midori-trash.h | 0 {src => midori}/midori-websettings.c | 0 {src => midori}/midori-websettings.h | 0 {src => midori}/midori-webview.c | 0 {src => midori}/midori-webview.h | 0 {src => midori}/search.c | 0 {src => midori}/search.h | 0 {src => midori}/sokoke.c | 0 {src => midori}/sokoke.h | 0 {src => midori}/webSearch.c | 0 {src => midori}/webSearch.h | 0 {src => midori}/wscript_build | 0 wscript | 5 ++--- 33 files changed, 5 insertions(+), 17 deletions(-) rename {src => midori}/Makefile.am (100%) rename {src => midori}/gjs.c (100%) rename {src => midori}/gjs.h (100%) rename {src => midori}/main.c (100%) rename {src => midori}/main.h (100%) rename {src => midori}/midori-addons.c (100%) rename {src => midori}/midori-addons.h (100%) rename {src => midori}/midori-app.c (100%) rename {src => midori}/midori-app.h (100%) rename {src => midori}/midori-browser.c (100%) rename {src => midori}/midori-browser.h (100%) rename {src => midori}/midori-console.c (100%) rename {src => midori}/midori-console.h (100%) rename {src => midori}/midori-panel.c (100%) rename {src => midori}/midori-panel.h (100%) rename {src => midori}/midori-preferences.c (100%) rename {src => midori}/midori-preferences.h (100%) rename {src => midori}/midori-trash.c (100%) rename {src => midori}/midori-trash.h (100%) rename {src => midori}/midori-websettings.c (100%) rename {src => midori}/midori-websettings.h (100%) rename {src => midori}/midori-webview.c (100%) rename {src => midori}/midori-webview.h (100%) rename {src => midori}/search.c (100%) rename {src => midori}/search.h (100%) rename {src => midori}/sokoke.c (100%) rename {src => midori}/sokoke.h (100%) rename {src => midori}/webSearch.c (100%) rename {src => midori}/webSearch.h (100%) rename {src => midori}/wscript_build (100%) diff --git a/Makefile.am b/Makefile.am index d8b5d3a9..5270e0d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = katze src po data +SUBDIRS = katze midori po data desktopdir = $(datadir)/applications desktop_in_files = midori.desktop diff --git a/configure.in b/configure.in index 784509be..72c121e5 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # Register ourselves to autoconf AC_INIT([midori], [0.0.18], [christian@twotoasts.de]) -AC_CONFIG_SRCDIR([src/main.h]) +AC_CONFIG_SRCDIR([midori/main.h]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) @@ -101,19 +101,8 @@ fi AC_CONFIG_FILES([ Makefile \ katze/Makefile \ - src/Makefile \ + midori/Makefile \ po/Makefile.in \ data/Makefile ]) AC_OUTPUT - -# Show us what we have -echo -echo " GTK+2 $GTK_VER" -echo " WebKit $WEBKIT_VER" -echo " Libsexy $LIBSEXY_VER" -echo " libXML2 $LIBXML_VER" -echo -echo " Debugging $enable_debug" -echo -echo " Prefix $prefix" diff --git a/src/Makefile.am b/midori/Makefile.am similarity index 100% rename from src/Makefile.am rename to midori/Makefile.am diff --git a/src/gjs.c b/midori/gjs.c similarity index 100% rename from src/gjs.c rename to midori/gjs.c diff --git a/src/gjs.h b/midori/gjs.h similarity index 100% rename from src/gjs.h rename to midori/gjs.h diff --git a/src/main.c b/midori/main.c similarity index 100% rename from src/main.c rename to midori/main.c diff --git a/src/main.h b/midori/main.h similarity index 100% rename from src/main.h rename to midori/main.h diff --git a/src/midori-addons.c b/midori/midori-addons.c similarity index 100% rename from src/midori-addons.c rename to midori/midori-addons.c diff --git a/src/midori-addons.h b/midori/midori-addons.h similarity index 100% rename from src/midori-addons.h rename to midori/midori-addons.h diff --git a/src/midori-app.c b/midori/midori-app.c similarity index 100% rename from src/midori-app.c rename to midori/midori-app.c diff --git a/src/midori-app.h b/midori/midori-app.h similarity index 100% rename from src/midori-app.h rename to midori/midori-app.h diff --git a/src/midori-browser.c b/midori/midori-browser.c similarity index 100% rename from src/midori-browser.c rename to midori/midori-browser.c diff --git a/src/midori-browser.h b/midori/midori-browser.h similarity index 100% rename from src/midori-browser.h rename to midori/midori-browser.h diff --git a/src/midori-console.c b/midori/midori-console.c similarity index 100% rename from src/midori-console.c rename to midori/midori-console.c diff --git a/src/midori-console.h b/midori/midori-console.h similarity index 100% rename from src/midori-console.h rename to midori/midori-console.h diff --git a/src/midori-panel.c b/midori/midori-panel.c similarity index 100% rename from src/midori-panel.c rename to midori/midori-panel.c diff --git a/src/midori-panel.h b/midori/midori-panel.h similarity index 100% rename from src/midori-panel.h rename to midori/midori-panel.h diff --git a/src/midori-preferences.c b/midori/midori-preferences.c similarity index 100% rename from src/midori-preferences.c rename to midori/midori-preferences.c diff --git a/src/midori-preferences.h b/midori/midori-preferences.h similarity index 100% rename from src/midori-preferences.h rename to midori/midori-preferences.h diff --git a/src/midori-trash.c b/midori/midori-trash.c similarity index 100% rename from src/midori-trash.c rename to midori/midori-trash.c diff --git a/src/midori-trash.h b/midori/midori-trash.h similarity index 100% rename from src/midori-trash.h rename to midori/midori-trash.h diff --git a/src/midori-websettings.c b/midori/midori-websettings.c similarity index 100% rename from src/midori-websettings.c rename to midori/midori-websettings.c diff --git a/src/midori-websettings.h b/midori/midori-websettings.h similarity index 100% rename from src/midori-websettings.h rename to midori/midori-websettings.h diff --git a/src/midori-webview.c b/midori/midori-webview.c similarity index 100% rename from src/midori-webview.c rename to midori/midori-webview.c diff --git a/src/midori-webview.h b/midori/midori-webview.h similarity index 100% rename from src/midori-webview.h rename to midori/midori-webview.h diff --git a/src/search.c b/midori/search.c similarity index 100% rename from src/search.c rename to midori/search.c diff --git a/src/search.h b/midori/search.h similarity index 100% rename from src/search.h rename to midori/search.h diff --git a/src/sokoke.c b/midori/sokoke.c similarity index 100% rename from src/sokoke.c rename to midori/sokoke.c diff --git a/src/sokoke.h b/midori/sokoke.h similarity index 100% rename from src/sokoke.h rename to midori/sokoke.h diff --git a/src/webSearch.c b/midori/webSearch.c similarity index 100% rename from src/webSearch.c rename to midori/webSearch.c diff --git a/src/webSearch.h b/midori/webSearch.h similarity index 100% rename from src/webSearch.h rename to midori/webSearch.h diff --git a/src/wscript_build b/midori/wscript_build similarity index 100% rename from src/wscript_build rename to midori/wscript_build diff --git a/wscript b/wscript index 6f4b9562..862d587f 100644 --- a/wscript +++ b/wscript @@ -23,8 +23,7 @@ def configure (conf): conf.check_tool ('compiler_cc') if not Params.g_options.disable_nls: conf.check_tool ('intltool') - # FIXME if we have intltool but not msgfmt the build breaks - if conf.env['INTLTOOL']: + if conf.env['INTLTOOL'] and conf.env['POCOM']: nls = 'yes' conf.define ('ENABLE_NLS', 1) conf.define ('MIDORI_LOCALEDIR', 'LOCALEDIR', 0) @@ -69,7 +68,7 @@ def set_options (opt): help='Disables native language support', dest='disable_nls') def build (bld): - bld.add_subdirs ('katze src data') + bld.add_subdirs ('katze midori data') if bld.env ()['INTLTOOL']: bld.add_subdirs ('po')