X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=multimedia%2Fgphoto2%2FMakefile;h=2af8dfe80adf957ebcad553edd36d5e707b17c9c;hp=81665fc75bb091fdb4848626f4a97913d129a133;hb=8512d881e5d25e3cad4b295a5af974ca28c4a575;hpb=6eadf27020e3d854cdc0fa30493a550e20f81372

diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile
index 81665fc75b..2af8dfe80a 100644
--- a/multimedia/gphoto2/Makefile
+++ b/multimedia/gphoto2/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -12,12 +12,12 @@ PKG_NAME:=gphoto2
 PKG_VERSION:=2.2.0
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/gphoto
 PKG_MD5SUM:=f5c1f83185db598b4ca52889964a5e84
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -25,46 +25,34 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gphoto2
   SECTION:=multimedia
   CATEGORY:=Multimedia
-  DEPENDS:=+libusb +libexif +libpopt +libgphoto2
+  DEPENDS:=+libexif +libgphoto2 +libltdl +libpopt +libpthread
   TITLE:=Gphoto Digital Camera Control
   DESCRIPTION:=For downloading and controlling digital cameras
-  URL:=http://www.gphoto.org
+  URL:=http://www.gphoto.org/
 endef
 
-BIG_ENDIAN:=no
-ifeq ($(ARCH),mips)
-BIG_ENDIAN:=yes
-endif
-ifeq ($(ARCH),armeb)
-BIG_ENDIAN:=yes
-endif
-ifeq ($(ARCH),powerpc)
-BIG_ENDIAN:=yes
-endif
-
 define Build/Configure
-$(call Build/Configure/Default,--without-libiconv-prefix \
+	$(call Build/Configure/Default, \
+		--without-libiconv-prefix \
 		--without-libintl-prefix \
-		$(DISABLE_LARGEFILE) \
-		$(DISABLE_NLS) \
-		--enable-shared \
-		--enable-static,LIBGPHOTO2_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/gphoto2" \
-		LIBGPHOTO2_LIBS="-L$(STAGING_DIR)/usr/lib -lgphoto2_port -lgphoto2" \
-		LIBEXIF_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-		LIBEXIF_LIBS="-L$(STAGING_DIR)/usr/lib -lexif" \
-		POPT_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-		POPT_LIBS="-L$(STAGING_DIR)/usr/lib -lpopt" \
-		ac_cv_c_bigendian=$(BIG_ENDIAN) \
-		ac_cv_func_malloc_0_nonnull=yes)
+		, \
+		LIBGPHOTO2_CFLAGS="$$$$CFLAGS -I$(STAGING_DIR)/usr/include/gphoto2 $$$$CPPFLAGS" \
+		LIBGPHOTO2_LIBS="$$$$LDFLAGS -lgphoto2 -lgphoto2_port -lltdl" \
+		LIBEXIF_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \
+		LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \
+		POPT_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \
+		POPT_LIBS="$$$$LDFLAGS -lpopt" \
+	)
 endef
 
 define Build/Compile
-$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
 endef
 
 define Package/gphoto2/install
-	install -d -m0755 $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gphoto2 $(1)/usr/bin/
 endef