fix glib1/gtk1 compile

[openwrt/svn-archive/archive.git] / libs / glib / Makefile

diff --git a/libs/glib/Makefile b/libs/glib/Makefile
index 184db0c76b7bc793d071a96b7238cffa50ce1f22..024c8c85753ce1b15fb41106c59b8b1a1df70af0 100644 (file)
--- a/libs/glib/Makefile
+++ b/libs/glib/Makefile
@@ -18,10 +18,8 @@ PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,14 +28,19 @@ define Package/glib1
   CATEGORY:=Libraries
   DEPENDS:=+libpthread
   TITLE:=The GLib library of C routines
-  DESCRIPTION:=\
-       GLib is a library containing many useful C routines for things such \\\
-       as trees, hashes, and lists.
   URL:=http://www.gtk.org/
 endef
 
-# commas are interpreted by the $(call ...) macro, so define an intermediate variable holding our settings
-PKG_CONFIGURE_VARS:=\
+define Package/glib1/description
+ GLib is a library containing many useful C routines for things such 
+ as trees, hashes, and lists.
+endef
+
+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 \
@@ -53,47 +56,24 @@ PKG_CONFIGURE_VARS:=\
        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" \
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               , \
-               $(PKG_CONFIGURE_VARS) \
-       )
-endef
-
+TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/lib
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
+       $(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/
-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
+       $(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 Package/glib1/install
-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(1)/usr/lib/
 endef