* Kconfig popt.in libpopt.in libpopt.make popt.make oprofile.in:

	renamed popt -> libpopt


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5378 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 145 insertions, 133 deletions

diff --git a/rules/Kconfig b/rules/Kconfig
index 0ac76aa53..544d321c9 100644
--- a/rules/Kconfig
+++ b/rules/Kconfig
@@ -110,13 +110,13 @@ endmenu
 
 menu "Applications                "
 depends on BUILD_USERLAND
+source "rules/alsa-utils.in"
 source "rules/flash.in"
 source "rules/gnupg.in"
 source "rules/mad.in"
+source "rules/mplayer.in"
 source "rules/setmixer.in"
 source "rules/rawrec.in"
-source "rules/mplayer.in"
-source "rules/alsa-utils.in"
 endmenu
 
 menu "Tools                       "
@@ -131,23 +131,26 @@ endmenu
 
 menu "System Libraries            "
 depends on BUILD_USERLAND
+source "rules/alsa-lib.in"
 source "rules/boost.in"
 source "rules/commoncpp2.in"
 source "rules/db41.in"
 source "rules/expat.in"
 source "rules/gettext.in"
 source "rules/hrtimers-support.in"
+
 source "rules/libelf.in"
 source "rules/libezv24.in"
 source "rules/liblist.in"
 source "rules/libmqueue.in"
 source "rules/libnetpbm.in"
+source "rules/libpopt.in"
 source "rules/libxml2.in"
 source "rules/libxmlconfig.in"
 source "rules/libxslt.in"
+
 source "rules/ncurses.in"
 source "rules/pcre.in"
-source "rules/popt.in"
 source "rules/readline.in"
 source "rules/librn.in"
 source "rules/libgsloop.in"
@@ -155,8 +158,6 @@ source "rules/slang.in"
 source "rules/sqlite.in"
 source "rules/termcap.in"
 source "rules/zlib.in"
-source "rules/alsa-lib.in"
-source "rules/gtk-menu.in"
 endmenu
 
 menu "Middleware                  "
@@ -171,6 +172,7 @@ depends on BUILD_USERLAND
 source "rules/xorg.in"
 
 comment "X Applications"
+source "rules/gtk-menu.in"
 #source "rules/gtk22.in"
 source "rules/fltk.in"
 #source "rules/qte.in"
diff --git a/rules/popt.in b/rules/libpopt.in
index 0e84a840b..1356904ab 100644
--- a/rules/popt.in
+++ b/rules/libpopt.in
@@ -1,5 +1,5 @@
-config POPT
+config LIBPOPT
 	bool
-	prompt "popt"
+	prompt "libpopt"
 	help
 	  FIXME: This item needs to be documented
diff --git a/rules/libpopt.make b/rules/libpopt.make
new file mode 100644
index 000000000..428807497
--- /dev/null
+++ b/rules/libpopt.make
@@ -0,0 +1,135 @@
+# -*-makefile-*-
+# $Id$
+#
+# Copyright (C) 2003 by Benedikt Spranger
+#          
+# 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_LIBPOPT) += libpopt
+
+#
+# Paths and names
+#
+LIBPOPT_VERSION	:= 1.7
+LIBPOPT		:= popt-$(LIBPOPT_VERSION)
+LIBPOPT_SUFFIX	:= tar.gz
+LIBPOPT_URL	:= ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/$(LIBPOPT).$(LIBPOPT_SUFFIX)
+LIBPOPT_SOURCE	:= $(SRCDIR)/$(LIBPOPT).$(LIBPOPT_SUFFIX)
+LIBPOPT_DIR	:= $(BUILDDIR)/$(LIBPOPT)
+
+-include $(call package_depfile)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+libpopt_get: $(STATEDIR)/libpopt.get
+
+$(STATEDIR)/libpopt.get: $(libpopt_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(LIBPOPT_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, $(LIBPOPT_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+libpopt_extract: $(STATEDIR)/libpopt.extract
+
+$(STATEDIR)/libpopt.extract: $(libpopt_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(LIBPOPT_DIR))
+	@$(call extract, $(LIBPOPT_SOURCE))
+	@$(call patchin, $(LIBPOPT))
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+libpopt_prepare: $(STATEDIR)/libpopt.prepare
+
+LIBPOPT_PATH	:=  PATH=$(CROSS_PATH)
+LIBPOPT_ENV 	:=  $(CROSS_ENV)
+
+#
+# autoconf
+#
+LIBPOPT_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+$(STATEDIR)/libpopt.prepare: $(libpopt_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(LIBPOPT_DIR)/config.cache)
+	cd $(LIBPOPT_DIR) && \
+		$(LIBPOPT_PATH) $(LIBPOPT_ENV) \
+		./configure $(LIBPOPT_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+libpopt_compile: $(STATEDIR)/libpopt.compile
+
+$(STATEDIR)/libpopt.compile: $(libpopt_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(LIBPOPT_DIR) && $(LIBPOPT_PATH) make
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+libpopt_install: $(STATEDIR)/libpopt.install
+
+$(STATEDIR)/libpopt.install: $(libpopt_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, LIBPOPT)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+libpopt_targetinstall: $(STATEDIR)/libpopt.targetinstall
+
+$(STATEDIR)/libpopt.targetinstall: $(libpopt_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, libpopt)
+	@$(call install_fixup,libpopt,PACKAGE,libpopt)
+	@$(call install_fixup,libpopt,PRIORITY,optional)
+	@$(call install_fixup,libpopt,VERSION,$(LIBPOPT_VERSION))
+	@$(call install_fixup,libpopt,SECTION,base)
+	@$(call install_fixup,libpopt,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,libpopt,DEPENDS,)
+	@$(call install_fixup,libpopt,DESCRIPTION,missing)
+
+	@$(call install_copy, libpopt, 0, 0, 0644, $(LIBPOPT_DIR)/.libs/libpopt.so.0.0.0, /usr/lib/libpopt.so.0.0.0)
+	@$(call install_link, libpopt, libpopt.so.0.0.0, /usr/lib/libpopt.so.0)
+	@$(call install_link, libpopt, libpopt.so.0.0.0, /usr/lib/libpopt.so)
+
+	@$(call install_finish,libpopt)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+libpopt_clean:
+	rm -rf $(STATEDIR)/libpopt.*
+	rm -rf $(IMAGEDIR)/libpopt_*
+	rm -rf $(LIBPOPT_DIR)
+
+# vim: syntax=make
diff --git a/rules/oprofile.in b/rules/oprofile.in
index de145a00c..e7471fdeb 100644
--- a/rules/oprofile.in
+++ b/rules/oprofile.in
@@ -1,6 +1,6 @@
 config OPROFILE
 	bool
-	select POPT
+	select LIBPOPT
 	select BINUTILS
 	prompt "oprofile"
 	help
diff --git a/rules/popt.make b/rules/popt.make
deleted file mode 100644
index ef4d55990..000000000
--- a/rules/popt.make
+++ /dev/null
@@ -1,125 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
-#          
-# 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.
-#
-
-# FIXME: does nothing on targetinstall? 
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_POPT) += popt
-
-#
-# Paths and names
-#
-POPT_VERSION	= 1.7
-POPT		= popt-$(POPT_VERSION)
-POPT_SUFFIX	= tar.gz
-POPT_URL	= ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/$(POPT).$(POPT_SUFFIX)
-POPT_SOURCE	= $(SRCDIR)/$(POPT).$(POPT_SUFFIX)
-POPT_DIR	= $(BUILDDIR)/$(POPT)
-
--include $(call package_depfile)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-popt_get: $(STATEDIR)/popt.get
-
-$(STATEDIR)/popt.get: $(popt_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-$(POPT_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(POPT_URL))
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-popt_extract: $(STATEDIR)/popt.extract
-
-$(STATEDIR)/popt.extract: $(popt_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(POPT_DIR))
-	@$(call extract, $(POPT_SOURCE))
-	@$(call patchin, $(POPT))
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-popt_prepare: $(STATEDIR)/popt.prepare
-
-POPT_PATH	=  PATH=$(CROSS_PATH)
-POPT_ENV 	=  $(CROSS_ENV)
-
-#
-# autoconf
-#
-#POPT_AUTOCONF = \
-#	--build=$(GNU_HOST) \
-#	--host=$(PTXCONF_GNU_TARGET)
-
-POPT_AUTOCONF = $(CROSS_AUTOCONF_USR)
-
-$(STATEDIR)/popt.prepare: $(popt_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(POP_DIR)/config.cache)
-	cd $(POPT_DIR) && \
-		$(POPT_PATH) $(POPT_ENV) \
-		./configure $(POPT_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-popt_compile: $(STATEDIR)/popt.compile
-
-$(STATEDIR)/popt.compile: $(popt_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(POPT_DIR) && $(POPT_PATH) make
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-popt_install: $(STATEDIR)/popt.install
-
-$(STATEDIR)/popt.install: $(popt_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call install, POPT)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-popt_targetinstall: $(STATEDIR)/popt.targetinstall
-
-$(STATEDIR)/popt.targetinstall: $(popt_targetinstall_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-popt_clean:
-	rm -rf $(STATEDIR)/popt.*
-	rm -rf $(IMAGEDIR)/popt_*
-	rm -rf $(POPT_DIR)
-
-# vim: syntax=make