* [Buildroot] [PATCH] libungif: convert to autotools infrastructure
@ 2009-12-29 10:16 Lionel Landwerlin
2009-12-29 21:46 ` Lionel Landwerlin
0 siblings, 1 reply; 3+ messages in thread
From: Lionel Landwerlin @ 2009-12-29 10:16 UTC (permalink / raw)
To: buildroot
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libungif/libungif.mk | 65
++++++-----------------------------------
1 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
index 6e3be9c..31934c1 100644
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -6,64 +6,19 @@
LIBUNGIF_VERSION:=4.1.4
LIBUNGIF_SOURCE:=libungif-$(LIBUNGIF_VERSION).tar.bz2
LIBUNGIF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).
dl.sourceforge.net/sourceforge/giflib
-LIBUNGIF_DIR:=$(BUILD_DIR)/libungif-$(LIBUNGIF_VERSION)
-LIBUNGIF_CAT:=$(BZCAT)
-LIBUNGIF_BINARY:=libungif.so.$(LIBUNGIF_VERSION)
-LIBUNGIF_TARGET_BINARY:=usr/lib/libungif.so
+LIBUNGIF_INSTALL_STAGING = YES
+LIBUNGIF_INSTALL_TARGET = YES
-$(DL_DIR)/$(LIBUNGIF_SOURCE):
- $(call DOWNLOAD,$(LIBUNGIF_SITE),$(LIBUNGIF_SOURCE))
+LIBUNGIF_CONF_OPT = --without-x
-libungif-source: $(DL_DIR)/$(LIBUNGIF_SOURCE)
-
-$(LIBUNGIF_DIR)/.unpacked: $(DL_DIR)/$(LIBUNGIF_SOURCE)
- $(LIBUNGIF_CAT) $(DL_DIR)/$(LIBUNGIF_SOURCE) | tar -C $(BUILD_DIR)
$(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LIBUNGIF_DIR) package/libungif/
libungif-$(LIBUNGIF_VERSION)\*.patch\*
- $(CONFIG_UPDATE) $(LIBUNGIF_DIR)
- touch $@
-
-$(LIBUNGIF_DIR)/.configured: $(LIBUNGIF_DIR)/.unpacked
- (cd $(LIBUNGIF_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_ARGS) \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --sysconfdir=/etc \
- --enable-shared \
- --enable-static \
- --prefix=/usr \
- --without-x \
- )
- touch $@
-
-$(LIBUNGIF_DIR)/lib/.libs/libungif.a: $(LIBUNGIF_DIR)/.configured
- $(MAKE) -C $(LIBUNGIF_DIR)
-
-$(STAGING_DIR)/usr/lib/libungif.a: $(LIBUNGIF_DIR)/lib/.libs/libungif.a
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBUNGIF_DIR) install
+define LIBUNGIF_INSTALL_STAGING_CMDS
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g"
$(STAGING_DIR)/usr/lib/libungif.la
+endef
-$(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libungif.a
- cp -dpf $(STAGING_DIR)/$(LIBUNGIF_TARGET_BINARY)*
$(TARGET_DIR)/usr/lib/
+define LIBUNGIF_INSTALL_TARGET_CMDS
+ cp -dpf $(STAGING_DIR)/usr/lib/libungif.so* $(TARGET_DIR)/usr/lib/
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
$(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)*
+endef
-libungif: $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)
-
-libungif-clean:
- rm -f $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)*
- -$(MAKE) -C $(LIBUNGIF_DIR) clean
-
-libungif-dirclean:
- rm -rf $(LIBUNGIF_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LIBUNGIF),y)
-TARGETS+=libungif
-endif
+$(eval $(call AUTOTARGETS,package,libungif))
--
1.6.5.7
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20091229/afd1b55f/attachment.htm>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] libungif: convert to autotools infrastructure
2009-12-29 10:16 [Buildroot] [PATCH] libungif: convert to autotools infrastructure Lionel Landwerlin
@ 2009-12-29 21:46 ` Lionel Landwerlin
2009-12-30 13:06 ` Peter Korsgaard
0 siblings, 1 reply; 3+ messages in thread
From: Lionel Landwerlin @ 2009-12-29 21:46 UTC (permalink / raw)
To: buildroot
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libungif/libungif.mk | 65 ++++++-----------------------------------
1 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
index 6e3be9c..31934c1 100644
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -6,64 +6,19 @@
LIBUNGIF_VERSION:=4.1.4
LIBUNGIF_SOURCE:=libungif-$(LIBUNGIF_VERSION).tar.bz2
LIBUNGIF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/giflib
-LIBUNGIF_DIR:=$(BUILD_DIR)/libungif-$(LIBUNGIF_VERSION)
-LIBUNGIF_CAT:=$(BZCAT)
-LIBUNGIF_BINARY:=libungif.so.$(LIBUNGIF_VERSION)
-LIBUNGIF_TARGET_BINARY:=usr/lib/libungif.so
+LIBUNGIF_INSTALL_STAGING = YES
+LIBUNGIF_INSTALL_TARGET = YES
-$(DL_DIR)/$(LIBUNGIF_SOURCE):
- $(call DOWNLOAD,$(LIBUNGIF_SITE),$(LIBUNGIF_SOURCE))
+LIBUNGIF_CONF_OPT = --without-x
-libungif-source: $(DL_DIR)/$(LIBUNGIF_SOURCE)
-
-$(LIBUNGIF_DIR)/.unpacked: $(DL_DIR)/$(LIBUNGIF_SOURCE)
- $(LIBUNGIF_CAT) $(DL_DIR)/$(LIBUNGIF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LIBUNGIF_DIR) package/libungif/ libungif-$(LIBUNGIF_VERSION)\*.patch\*
- $(CONFIG_UPDATE) $(LIBUNGIF_DIR)
- touch $@
-
-$(LIBUNGIF_DIR)/.configured: $(LIBUNGIF_DIR)/.unpacked
- (cd $(LIBUNGIF_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_ARGS) \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --sysconfdir=/etc \
- --enable-shared \
- --enable-static \
- --prefix=/usr \
- --without-x \
- )
- touch $@
-
-$(LIBUNGIF_DIR)/lib/.libs/libungif.a: $(LIBUNGIF_DIR)/.configured
- $(MAKE) -C $(LIBUNGIF_DIR)
-
-$(STAGING_DIR)/usr/lib/libungif.a: $(LIBUNGIF_DIR)/lib/.libs/libungif.a
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBUNGIF_DIR) install
+define LIBUNGIF_INSTALL_STAGING_CMDS
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libungif.la
+endef
-$(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libungif.a
- cp -dpf $(STAGING_DIR)/$(LIBUNGIF_TARGET_BINARY)* $(TARGET_DIR)/usr/lib/
+define LIBUNGIF_INSTALL_TARGET_CMDS
+ cp -dpf $(STAGING_DIR)/usr/lib/libungif.so* $(TARGET_DIR)/usr/lib/
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)*
+endef
-libungif: $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)
-
-libungif-clean:
- rm -f $(TARGET_DIR)/$(LIBUNGIF_TARGET_BINARY)*
- -$(MAKE) -C $(LIBUNGIF_DIR) clean
-
-libungif-dirclean:
- rm -rf $(LIBUNGIF_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LIBUNGIF),y)
-TARGETS+=libungif
-endif
+$(eval $(call AUTOTARGETS,package,libungif))
--
1.6.5.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] libungif: convert to autotools infrastructure
2009-12-29 21:46 ` Lionel Landwerlin
@ 2009-12-30 13:06 ` Peter Korsgaard
0 siblings, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2009-12-30 13:06 UTC (permalink / raw)
To: buildroot
>>>>> "Lionel" == Lionel Landwerlin <llandwerlin@gmail.com> writes:
Lionel> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Committed with the same comments as for jpeg.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-30 13:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-29 10:16 [Buildroot] [PATCH] libungif: convert to autotools infrastructure Lionel Landwerlin
2009-12-29 21:46 ` Lionel Landwerlin
2009-12-30 13:06 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox