Fantastic! Thanks for the reply and time. I will make the changes. BTW. Wow, the make files have gotten simple, good work!
Ryan On 12 August 2010 20:41, Marc Kleine-Budde <m...@pengutronix.de> wrote: > Ryan Raasch wrote: >> Round 2 after a large overhaul of code. Thanks for the tips! >> >> These are based on the 2010-06-27 snapshot and are considered to be stable. > > The packages look good. Although they contain unneeded stages. See > comments inline. > >> >> Signed-off-by: Ryan M. Raasch <ryan.raa...@gmail.com> >> --- >> rules/e_dbus.make | 114 ++++++++++++++++++++++++++++++++++ >> rules/ecore.make | 127 >> ++++++++++++++++++++++++++++++++++++++ >> rules/efl.in | 64 +++++++++++++++++++ >> rules/eina.make | 111 +++++++++++++++++++++++++++++++++ >> rules/graphics_and_multimedia.in | 4 + >> 5 files changed, 420 insertions(+), 0 deletions(-) >> create mode 100644 rules/e_dbus.make >> create mode 100644 rules/ecore.make >> create mode 100644 rules/efl.in >> create mode 100644 rules/eina.make >> >> diff --git a/rules/e_dbus.make b/rules/e_dbus.make >> new file mode 100644 >> index 0000000..8aa7644 >> --- /dev/null >> +++ b/rules/e_dbus.make >> @@ -0,0 +1,114 @@ >> +# -*-makefile-*- >> +# $Id$ > > please remove the id line > >> +# >> +# Copyright (C) 2007 by Lars Munch <l...@segv.dk>, >> +# Ryan Raasch <ryan.raa...@gmail.com> > > as you've changed these files you may want to update you copyright notice. > >> +# >> +# See CREDITS for details about who has contributed to this project. >> +# >> +# For further information about the PTXdist project and license conditions >> +# see the README file. >> +# >> + >> +# >> +# We provide this package >> +# >> +PACKAGES-$(PTXCONF_E_DBUS) += e_dbus >> + >> +# >> +# Paths and names >> +# >> +E_DBUS_VERSION := 0.5.0.49898 >> +E_DBUS := e_dbus-$(E_DBUS_VERSION) >> +E_DBUS_SUFFIX := tar.bz2 >> +E_DBUS_URL := >> http://download.enlightenment.org/snapshots/2010-06-27/$(E_DBUS).$(E_DBUS_SUFFIX) >> +E_DBUS_SOURCE := $(SRCDIR)/$(E_DBUS).$(E_DBUS_SUFFIX) >> +E_DBUS_DIR := $(BUILDDIR)/$(E_DBUS) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Get >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/e_dbus.get: >> + @$(call targetinfo, $@) >> + @$(call touch, $@) > > please remove the get stage (I know, the template does still contain it) > >> + >> +# >> ---------------------------------------------------------------------------- >> +# Extract >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/e_dbus.extract: >> + @$(call targetinfo, $@) >> + @$(call clean, $(E_DBUS_DIR)) >> + @$(call extract, E_DBUS) >> + @$(call touch, $@) >> + > > please remove the extract stage > >> +# >> ---------------------------------------------------------------------------- >> +# Prepare >> +# >> ---------------------------------------------------------------------------- >> + >> +E_DBUS_PATH := PATH=$(CROSS_PATH) >> +E_DBUS_CONF_ENV := $(CROSS_ENV) > > please remove PATH and ENV > > If you want to use CONF_OPT, please add a CONF_TOOL := autoconf > >> +E_DBUS_CONF_OPT := $(CROSS_AUTOCONF_USR) >> + >> +$(STATEDIR)/e_dbus.prepare: >> + @$(call targetinfo, $@) >> + @$(call clean, $(E_DBUS_DIR)/config.cache) >> + cd $(E_DBUS_DIR) && \ >> + $(E_DBUS_PATH) $(E_DBUS_CONF_ENV) \ >> + ./configure $(E_DBUS_CONF_OPT) \ >> + --disable-econnman \ >> + --disable-ehal \ >> + --disable-enotify \ >> + --disable-ebluez \ >> + --disable-eofono > > please add the configure options to CONF_OPT and remove the preare stage > >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Compile >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/e_dbus.compile: >> + @$(call targetinfo, $@) >> + @$(call compile, E_DBUS) >> + @$(call touch, $@) > > please remove the compile stage > >> + >> +# >> ---------------------------------------------------------------------------- >> +# Install >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/e_dbus.install: >> + @$(call targetinfo, $@) >> + @$(call install, E_DBUS) >> + @$(call touch, $@) >> + > > please remove the install stage > >> +# >> ---------------------------------------------------------------------------- >> +# Target-Install >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/e_dbus.targetinstall: >> + @$(call targetinfo, $@) >> + >> + @$(call install_init, e_dbus) >> + @$(call install_fixup, e_dbus, PACKAGE, e_dbus) > > please remove the PACKAGE fixup > >> + @$(call install_fixup, e_dbus, PRIORITY, optional) >> + @$(call install_fixup, e_dbus, VERSION, $(E_DBUS_VERSION)) > > pleae remove the VERSION fixup > >> + @$(call install_fixup, e_dbus, SECTION, base) >> + @$(call install_fixup, e_dbus, AUTHOR, "Lars Munch <l...@segv.dk>") >> + @$(call install_fixup, e_dbus, AUTHOR, "Ryan Raasch >> <ryan.raa...@gmail.com>") > > only one "install fixup" for the author > (it's a limitation of install_fixup) > >> + @$(call install_fixup, e_dbus, DEPENDS,) > > please remove the DEPENDS fixup > >> + @$(call install_fixup, e_dbus, DESCRIPTION, missing) >> + >> + @$(call install_lib, ecore, 0, 0, 0644, libedbus_ipc-ver-svn-06) >> + @$(call install_finish, e_dbus) >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Clean >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/e_dbus_clean: >> + @$(call targetinfo) >> + @$(call clean_pkg, E_DBUS) > > please remove the clean stage >> + >> +# vim: syntax=make >> diff --git a/rules/ecore.make b/rules/ecore.make >> new file mode 100644 >> index 0000000..f95c63b >> --- /dev/null >> +++ b/rules/ecore.make >> @@ -0,0 +1,127 @@ >> +# -*-makefile-*- >> +# $Id$ >> +# >> +# Copyright (C) 2007 by Lars Munch <l...@segv.dk>, >> +# Ryan Raasch <ryan.raa...@gmail.com> >> +# >> +# See CREDITS for details about who has contributed to this project. >> +# >> +# For further information about the PTXdist project and license conditions >> +# see the README file. >> +# > > same comments apply to this file > >> + >> +# >> +# We provide this package >> +# >> +PACKAGES-$(PTXCONF_ECORE) += ecore >> + >> +# >> +# Paths and names >> +# >> +ECORE_VERSION := 0.9.9.49898 >> +ECORE := ecore-$(ECORE_VERSION) >> +ECORE_SUFFIX := tar.bz2 >> +ECORE_URL := >> http://download.enlightenment.org/snapshots/2010-06-27/$(ECORE).$(ECORE_SUFFIX) >> +ECORE_SOURCE := $(SRCDIR)/$(ECORE).$(ECORE_SUFFIX) >> +ECORE_DIR := $(BUILDDIR)/$(ECORE) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Get >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/ecore.get: >> + @$(call targetinfo, $@) >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Extract >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/ecore.extract: >> + @$(call targetinfo, $@) >> + @$(call clean, $(ECORE_DIR)) >> + @$(call extract, ECORE) >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Prepare >> +# >> ---------------------------------------------------------------------------- >> + >> +ECORE_CONF_ENV := $(CROSS_ENV) >> +ECORE_PATH := PATH=$(CROSS_PATH) >> +ECORE_CONF_OPT = \ >> + $(CROSS_AUTOCONF_USR) \ >> + --enable-ecore-file \ >> + --disable-ecore-config \ >> + --disable-abstract-sockets \ >> + --disable-ecore-imf > ^^^^^^^^ > use a tab, not spaces >> + >> +ifdef PTXCONF_ECORE_SSL >> +ECORE_AUTOCONF += --enable-openssl >> +endif >> + >> +ifndef PTXCONF_ECORE_ENABLE_INPUT >> +ECORE_AUTOCONF += --disable-ecore-input >> +endif >> + >> +$(STATEDIR)/ecore.prepare: >> + @$(call targetinfo, $@) >> + @$(call clean, $(ECORE_DIR)/config.cache) >> + cd $(ECORE_DIR) && \ >> + $(ECORE_PATH) $(ECORE_CONF_ENV) \ >> + ./configure $(ECORE_CONF_OPT) >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Compile >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/ecore.compile: >> + @$(call targetinfo, $@) >> + @$(call compile, ECORE) >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Install >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/ecore.install: >> + @$(call targetinfo, $@) >> + @$(call install, ECORE) >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Target-Install >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/ecore.targetinstall: >> + @$(call targetinfo, $@) >> + >> + @$(call install_init, ecore) >> + @$(call install_fixup, ecore, PACKAGE, ecore) >> + @$(call install_fixup, ecore, PRIORITY, optional) >> + @$(call install_fixup, ecore, VERSION, $(ECORE_VERSION)) >> + @$(call install_fixup, ecore, SECTION, base) >> + @$(call install_fixup, ecore, AUTHOR, "Lars Munch <l...@segv.dk>") >> + @$(call install_fixup, ecore, AUTHOR, "Ryan Raasch >> <ryan.raa...@gmail.com>") >> + @$(call install_fixup, ecore, DEPENDS,) >> + @$(call install_fixup, ecore, DESCRIPTION, missing) >> + >> + @$(call install_lib, ecore, 0, 0, 0644, libecore-ver-svn-06) >> + @$(call install_lib, ecore, 0, 0, 0644, libecore_con-ver-svn-06) >> + @$(call install_lib, ecore, 0, 0, 0644, libecore_file-ver-svn-06) >> + @$(call install_lib, ecore, 0, 0, 0644, libecore_ipc-ver-svn-06) >> + >> + @$(call install_finish, ecore) >> + >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Clean >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/ecore_clean: >> + @$(call targetinfo) >> + @$(call clean_pkg, ECORE) >> + >> +# vim: syntax=make >> diff --git a/rules/efl.in b/rules/efl.in >> new file mode 100644 >> index 0000000..74eb9b4 >> --- /dev/null >> +++ b/rules/efl.in >> @@ -0,0 +1,64 @@ >> +## SECTION=multimedia_efl >> + >> +config EFL >> + bool >> + prompt "efl" >> + help >> + Enlightenment Foundation Libraries is a collection of libraries >> + origionally written for use by the Enlightenment DR17 Window Manager. >> + However, as these libraries grew and were tested and deployed more >> + and more, general functionality was added bringing us to enjoy a rich >> + and powerful set of libraries that can be used to help solve all >> sorts >> + of problems and act as a venerable alternative to the currently >> popular >> + GTK and QT library sets. > > move this config EFS into "graphics_and_multimedia.in and make a > menuconfig from this. Make it similar to "menuconfig XORG". > >> + >> +if EFL >> +config ECORE >> + bool > > make all bool which belong to actual packages tristate please. > pleae provide per package a ".in" file and ".make" file. Use "## > SECTION=multimedia_efl" in the .in files. > >> + select EINA >> + prompt "ecore" >> + help >> + Ecore is the core event abstraction layer that makes event >> + loops, timeouts and idle handlers fast, optimized, and >> + convenient. >> + > > add a: > if ECORE > (see comment below) > >> +config ECORE_SSL >> + bool >> + depends on ECORE > > remove the "depends on" and group all options into a: "if ECORE...endif" > >> + select OPENSSL >> + prompt "ssl support" > > Due to a limitation in the automatic dependency generator, you have to > add the "select OPENSSL" to the symbol that defines the package, here: > ECORE. Add > select OPENSSL if ECORE_SSL > to the ECORE symbol. > >> + >> +config ECORE_ENABLE_INPUT >> + bool >> + depends on ECORE >> + prompt "xinput support" > > maybe you need to select some X libraries here? > > add: > endif > > >> +config EINA >> + bool >> + prompt "eina" >> + help >> + Eina is the base library of all data types used by the EFL. >> + It is designed to reduce CPU use as much as possible without >> + using too much memory. It provides >> + * list and inlined >> + * hash >> + * red-black tree >> + * shared string >> + * rectangle >> + * array iterator and accessor >> + * memory pool >> + * module >> + * fixed point and magic check helper. >> + The library itself is small and could easily be used without >> + any other EFL libraries. >> + >> +config E_DBUS >> + bool >> + select DBUS >> + select EINA >> + select ECORE >> + prompt "e_dbus" >> + help >> + This is the start of some basic convenience wrappers around dbus >> + to ease integrating dbus with EFL based applications. >> +endif >> diff --git a/rules/eina.make b/rules/eina.make >> new file mode 100644 >> index 0000000..25e3b82 >> --- /dev/null >> +++ b/rules/eina.make >> @@ -0,0 +1,111 @@ >> +# -*-makefile-*- >> +# $Id$ >> +# >> +# Copyright (C) 2007 by Lars Munch <l...@segv.dk>, >> +# Ryan Raasch <ryan.raa...@gmail.com> >> +# >> +# See CREDITS for details about who has contributed to this project. >> +# >> +# For further information about the PTXdist project and license conditions >> +# see the README file. >> +# > > the comments from the first .make file apply here, too >> + >> +# >> +# We provide this package >> +# >> +PACKAGES-$(PTXCONF_EINA) += eina >> + >> +# >> +# Paths and names >> +# >> +EINA_VERSION := 0.9.9.49898 >> +EINA := eina-$(EINA_VERSION) >> +EINA_SUFFIX := tar.bz2 >> +EINA_URL := >> http://download.enlightenment.org/snapshots/2010-06-27/$(EINA).$(EINA_SUFFIX) >> +EINA_SOURCE := $(SRCDIR)/$(EINA).$(EINA_SUFFIX) >> +EINA_DIR := $(BUILDDIR)/$(EINA) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Get >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/eina.get: >> + @$(call targetinfo, $@) >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Extract >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/eina.extract: >> + @$(call targetinfo, $@) >> + @$(call clean, $(EINA_DIR)) >> + @$(call extract, EINA) >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Prepare >> +# >> ---------------------------------------------------------------------------- >> + >> +EINA_PATH := PATH=$(CROSS_PATH) >> +EINA_CONF_ENV := $(CROSS_ENV) >> +EINA_CONF_OPT := $(CROSS_AUTOCONF_USR) >> + >> +$(STATEDIR)/eina.prepare: >> + @$(call targetinfo, $@) >> + @$(call clean, $(EINA_DIR)/config.cache) >> + cd $(EINA_DIR) && \ >> + $(EINA_PATH) $(EINA_CONF_ENV) \ >> + ./configure $(EINA_CONF_OPT) >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Compile >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/eina.compile: $(eina_compile_deps_default) >> + @$(call targetinfo, $@) >> + cd $(EINA_DIR) && $(EINA_PATH) make >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Install >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/eina.install: $(eina_install_deps_default) >> + @$(call targetinfo, $@) >> + @$(call install, EINA) >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Target-Install >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/eina.targetinstall: >> + @$(call targetinfo, $@) >> + >> + @$(call install_init, eina) >> + @$(call install_fixup, eina, PACKAGE, eina) >> + @$(call install_fixup, eina, PRIORITY, optional) >> + @$(call install_fixup, eina, VERSION, $(EINA_VERSION)) >> + @$(call install_fixup, eina, SECTION, base) >> + @$(call install_fixup, eina, AUTHOR, "Lars Munch <l...@segv.dk>") >> + @$(call install_fixup, eina, AUTHOR, "Ryan Raasch >> <ryan.raa...@gmail.com>") >> + @$(call install_fixup, eina, DEPENDS,) >> + @$(call install_fixup, eina, DESCRIPTION, missing) >> + >> + @$(call install_lib, eina, 0, 0, 0644, libeina-ver-svn-06) >> + >> + @$(call install_finish,eina) >> + >> + @$(call touch, $@) >> + >> +# >> ---------------------------------------------------------------------------- >> +# Clean >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/eina_clean: >> + @$(call targetinfo) >> + @$(call clean_pkg, EINA) >> + >> +# vim: syntax=make >> diff --git a/rules/graphics_and_multimedia.in >> b/rules/graphics_and_multimedia.in >> index d41c8a8..81a3ffc 100644 >> --- a/rules/graphics_and_multimedia.in >> +++ b/rules/graphics_and_multimedia.in >> @@ -61,6 +61,10 @@ menu "sdl " >> source "generated/multimedia_sdl.in" >> endmenu >> >> +menu "efl " >> +source "generated/multimedia_efl.in" >> +endmenu >> + > > Modell it after "menuconfig XORG" pleae. > >> menu "sound " >> source "generated/multimedia_sound.in" >> endmenu > > cheers, Marc > > -- > Pengutronix e.K. | Marc Kleine-Budde | > Industrial Linux Solutions | Phone: +49-231-2826-924 | > Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | > Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > > -- ptxdist mailing list ptxdist@pengutronix.de
