gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

package: remove useless arguments from CMAKETARGETS

Browse Source 
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
GENTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni 2011-09-29 21:57:44 +02:00 committed by Peter Korsgaard
parent 300f9c9c9d
commit 9e4aeb3c2b
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/Makefile.cmake.in
View File

@ -183,15 +183,13 @@ endef
################################################################################
# CMAKETARGETS -- the target generator macro for CMake packages
#
# Argument 1 is the package directory prefix [mandatory]
# Argument 2 is the lowercase package name [mandatory]
# Argument 3 is "target" or "host" [optional, default: "target"]
# Argument 1 is "target" or "host" [optional, default: "target"]
################################################################################
define CMAKETARGETS
ifeq ($(3),host)
$(call CMAKETARGETS_INNER,$(3)-$(2),$(call UPPERCASE,$(3)-$(2)),$(call UPPERCASE,$(2)),$(1),host)
ifeq ($(1),host)
$(call CMAKETARGETS_INNER,$(1)-$(call pkgname),$(call UPPERCASE,$(1)-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
else
$(call CMAKETARGETS_INNER,$(2),$(call UPPERCASE,$(2)),$(call UPPERCASE,$(2)),$(1),target)
$(call CMAKETARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
endif
endef

4
package/cdrkit/cdrkit.mk
View File

@ -20,5 +20,5 @@ CDRKIT_CONF_OPT += -DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)"
HOST_CDRKIT_CONF_OPT += -DCMAKE_C_FLAGS="-I$(HOST_DIR)/usr/include"
HOST_CDRKIT_CONF_OPT += -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)"
$(eval $(call CMAKETARGETS,package,cdrkit))
$(eval $(call CMAKETARGETS,package,cdrkit,host))
$(eval $(call CMAKETARGETS))
$(eval $(call CMAKETARGETS,host))

2
package/multimedia/libcuefile/libcuefile.mk
View File

@ -20,4 +20,4 @@ endef
LIBCUEFILE_POST_INSTALL_STAGING_HOOKS += LIBCUEFILE_INSTALL_STAGING_INCLUDES
LIBCUEFILE_POST_INSTALL_TARGET_HOOKS += LIBCUEFILE_INSTALL_TARGET_INCLUDES
$(eval $(call CMAKETARGETS,package/multimedia,libcuefile))
$(eval $(call CMAKETARGETS))

2
package/multimedia/musepack/musepack.mk
View File

@ -11,4 +11,4 @@ MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
MUSEPACK_INSTALL_STAGING = YES
MUSEPACK_MAKE = $(MAKE1)
$(eval $(call CMAKETARGETS,package/multimedia,musepack))
$(eval $(call CMAKETARGETS))

2
package/multimedia/taglib/taglib.mk
View File

@ -24,4 +24,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y)
TAGLIB_POST_INSTALL_TARGET_HOOKS += TAGLIB_REMOVE_DEVFILE
endif
$(eval $(call CMAKETARGETS,package/multimedia,taglib))
$(eval $(call CMAKETARGETS))

2
package/yajl/yajl.mk
View File

@ -8,4 +8,4 @@ YAJL_VERSION = 2.0.2
YAJL_SITE = git://github.com/lloyd/yajl.git
YAJL_INSTALL_STAGING = YES
$(eval $(call CMAKETARGETS,package,yajl))
$(eval $(call CMAKETARGETS))