X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fglib%2FMakefile;h=b79173707b30482da9dd06e33a38917f144f84b7;hp=b60f5f05a600821d1ceecf821583358d11355ff1;hb=b153cafdfedb003301aec77cdd0c8e3ff01228f2;hpb=837094a02fcfe490a829f25a3cf697775047f074

diff --git a/libs/glib/Makefile b/libs/glib/Makefile
index b60f5f05a6..b79173707b 100644
--- a/libs/glib/Makefile
+++ b/libs/glib/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -12,16 +11,14 @@ PKG_NAME:=glib
 PKG_VERSION:=1.2.10
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/gtk/v1.2 \
 	http://ftp.gwdg.de/pub/misc/grafik/gimp/gtk/v1.2/ \
 	http://ftp.esat.net/mirrors/ftp.gimp.org/pub/gtk/v1.2/ \
 	http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gtk/v1.2/
 PKG_MD5SUM:=6fe30dad87c77b91b632def29dd69ef9
-PKG_CAT:=zcat
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,97 +27,55 @@ define Package/glib1
   CATEGORY:=Libraries
   DEPENDS:=+libpthread
   TITLE:=The GLib library of C routines
-  DESCRIPTION:=The GLib library of C routines.\\\
-    GLib is a library containing many useful C routines for things such \\\
-    as trees, hashes, and lists.
   URL:=http://www.gtk.org/
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		glib_cv_sizeof_gmutex=24 \
-		ac_cv_sizeof_char=1 \
-		ac_cv_sizeof_short=2 \
-		ac_cv_sizeof_int=4 \
-		ac_cv_sizeof_long=4 \
-		ac_cv_sizeof_long_long=8 \
-		ac_cv_sizeof_void_p=4 \
-		glib_cv_prog_cc_ansi_proto="no" \
-		glib_cv_has__inline="yes" \
-		glib_cv_has__inline__="yes" \
-		glib_cv_hasinline="yes" \
-		glib_cv_sane_realloc="yes" \
-		glib_cv_va_copy="no" \
-		glib_cv___va_copy="yes" \
-		glib_cv_va_val_copy="yes" \
-		glib_cv_rtldglobal_broken="no" \
-		glib_cv_uscore="no" \
-		ac_cv_func_getpwuid_r="yes" \
-		glib_cv_func_pthread_mutex_trylock_posix="yes" \
-		glib_cv_func_pthread_cond_timedwait_posix="yes" \
-		glib_cv_sizeof_gmutex="24" \
-		glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--sbindir=/usr/sbin \
-			--libexecdir=/usr/lib \
-			--sysconfdir=/etc \
-			--datadir=/usr/share \
-			--localstatedir=/var \
-			--mandir=/usr/man \
-			--infodir=/usr/info \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared=yes \
-			--enable-static=yes \
-	);
+define Package/glib1/description
+ GLib is a library containing many useful C routines for things such 
+ as trees, hashes, and lists.
 endef
 
-define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-endef
+TARGET_CFLAGS += $(FPIC)
 
-define Package/glib1/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(1)/usr/lib/
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+
+CONFIGURE_VARS += \
+	glib_cv_prog_cc_ansi_proto=no \
+	glib_cv_has__inline=yes \
+	glib_cv_has__inline__=yes \
+	glib_cv_hasinline=yes \
+	glib_cv_sane_realloc=yes \
+	glib_cv_va_copy=no \
+	glib_cv___va_copy=yes \
+	glib_cv_va_val_copy=yes \
+	glib_cv_rtldglobal_broken=no \
+	glib_cv_uscore=no \
+	glib_cv_func_pthread_mutex_trylock_posix=yes \
+	glib_cv_func_pthread_cond_timedwait_posix=yes \
+	glib_cv_sizeof_gmutex=24 \
+	glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
+
+TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/lib
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(STAGING_DIR)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(STAGING_DIR)/usr/include/glib-1.2/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}.{a,so} $(STAGING_DIR)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-*.so.* $(STAGING_DIR)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/glib $(STAGING_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(INSTALL_DIR) $(1) $(2)/bin
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/.libs/*.a $(PKG_BUILD_DIR)/*/.libs/*.a $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(1)/usr/include/glib-1.2/
+	ln -sf $(STAGING_DIR)/usr/bin/glib-config $(2)/bin/
+	$(SED) 's,-I$$$${prefix}/include/glib,-I$(STAGING_DIR)/usr/include/glib,g' $(1)/usr/bin/glib-config
+	$(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(STAGING_DIR)/usr/lib/glib,g' $(1)/usr/bin/glib-config
+	$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/glib-config
 endef
 
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/bin/glib-config \
-		$(STAGING_DIR)/usr/include/glib-1.2 \
-		$(STAGING_DIR)/usr/lib/libg{lib,module,thread}.{a,so} \
-		$(STAGING_DIR)/usr/lib/libg{lib,module,thread}-*.so.* \
-		$(STAGING_DIR)/usr/lib/glib \
-		$(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
+define Package/glib1/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,glib1))