From 246dce9634c700d10ea7bd428d44c813f23ee2af Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 13 May 2004 12:50:06 +0000 Subject: [PATCH] do with the Makefile.. cleaner! :) SVN revision: 10204 --- legacy/ecore/src/lib/ecore_config/Makefile.am | 13 +++++++------ .../lib/ecore_config/build_system.db.sh.in | 19 ------------------- 2 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 legacy/ecore/src/lib/ecore_config/build_system.db.sh.in diff --git a/legacy/ecore/src/lib/ecore_config/Makefile.am b/legacy/ecore/src/lib/ecore_config/Makefile.am index 786c49e655..df81bb7c45 100644 --- a/legacy/ecore/src/lib/ecore_config/Makefile.am +++ b/legacy/ecore/src/lib/ecore_config/Makefile.am @@ -5,7 +5,6 @@ INCLUDES = \ -I$(top_srcdir)/src/lib/ecore_ipc \ -I$(top_srcdir)/ @evas_cflags@ @edb_cflags@ -DB = system.db CLEANFILES = $(DB) libecore_config_la_LDFLAGS = -version-info 1:0:0 \ @@ -16,6 +15,12 @@ ecore_config_ipc_ecore_la_LDFLAGS = -no-undefined -module \ if BUILD_ECORE_CONFIG +DB = system.db +$(DB): Makefile + edb_ed $(top_builddir)/src/lib/ecore_config/$(DB) add /e/theme/name str "winter" + edb_ed $(top_builddir)/src/lib/ecore_config/$(DB) add /apps/web/browser str `which firefox 2>/dev/null || which phoenix 2>/dev/null || which mozilla 2>/dev/null || which opera 2>/dev/null || which konqueror 2>/dev/null || which epiphany 2>/dev/null` + edb_ed $(top_builddir)/src/lib/ecore_config/$(DB) add /apps/web/email str `which thunderbird 2>/dev/null || which mozilla 2>/dev/null || which kmail 2>/dev/null || which sylpheed 2>/dev/null || which evolution 2>/dev/null` + lib_LTLIBRARIES = libecore_config.la ecore_config_ipc_ecore.la include_HEADERS = \ Ecore_Config.h @@ -53,9 +58,6 @@ libecore_config.la \ @edb_libs@ \ @evas_libs@ -$(DB): - sh $(top_srcdir)/src/lib/ecore_config/build_$(DB).sh - endif EXTRA_DIST = \ @@ -66,6 +68,5 @@ ipc_ecore.c \ ipc.h \ util.c \ util.h \ -edb.c \ -build_system.db.sh +edb.c diff --git a/legacy/ecore/src/lib/ecore_config/build_system.db.sh.in b/legacy/ecore/src/lib/ecore_config/build_system.db.sh.in deleted file mode 100644 index 299cc05714..0000000000 --- a/legacy/ecore/src/lib/ecore_config/build_system.db.sh.in +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -DB=system.db -edb_ed $DB add /e/theme/name str "winter" -edb_ed $DB add /e/font/path str "@prefix@/share/@PACKAGE@/data/fonts" -if [ $BROWSER ]; then -edb_ed $DB add /apps/web/browser str "$BROWSER" -else -edb_ed $DB add /apps/web/browser str "`which firefox 2>/dev/null || - which phoenix 2>/dev/null || - which mozilla 2>/dev/null || - which opera 2>/dev/null || - which konqueror 2>/dev/null || - which epiphany 2>/dev/null`" -fi -edb_ed $DB add /apps/web/email str "`which thunderbird 2>/dev/null || - which mozilla 2>/dev/null || - which kmail 2>/dev/null || - which sylpheed 2>/dev/null || - which evolution 2>/dev/null`"