diff --git a/XOrg/lib/gtk-1.2.10/Makefile b/XOrg/lib/gtk1/Makefile similarity index 92% rename from XOrg/lib/gtk-1.2.10/Makefile rename to XOrg/lib/gtk1/Makefile index 5c39ef40e..4fadb11cf 100644 --- a/XOrg/lib/gtk-1.2.10/Makefile +++ b/XOrg/lib/gtk1/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=gtk-1.2.10 +PKG_NAME:=gtk1 PKG_VERSION:=1.2.10 PKG_RELEASE:=1 @@ -30,7 +30,7 @@ EXTRA_CFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include EXTRA_LDFLAGS+=-lnotimpl -lglib -lgmodule -define Package/gtk-1.2.10 +define Package/gtk1 SECTION:=xorg-framework CATEGORY:=Xorg SUBMENU:=framework @@ -63,4 +63,4 @@ define Build/InstallDev $(SED) "s,libdirs=-L.*,libdirs=,g" $(2)/bin/gtk-config endef -$(eval $(call BuildPackage,gtk-1.2.10)) +$(eval $(call BuildPackage,gtk1)) diff --git a/XOrg/lib/gtk-2.10.14/Makefile b/XOrg/lib/gtk2/Makefile similarity index 92% rename from XOrg/lib/gtk-2.10.14/Makefile rename to XOrg/lib/gtk2/Makefile index 5e1e74d07..a80095710 100644 --- a/XOrg/lib/gtk-2.10.14/Makefile +++ b/XOrg/lib/gtk2/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=gtk2.10.14 +PKG_NAME:=gtk2 PKG_VERSION:=2.10.14 PKG_RELEASE:=1 @@ -22,7 +22,7 @@ EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/ -define Package/gtk-2.10.14 +define Package/gtk2 SECTION:=xorg-framework CATEGORY:=Xorg SUBMENU:=framework @@ -43,11 +43,11 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef -define Package/gtk-2.10.14/install +define Package/gtk2/install $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef -$(eval $(call BuildPackage,gtk-2.10.14)) +$(eval $(call BuildPackage,gtk2)) $(eval $(call RequireCommand,gdk-pixbuf-csource, \ Please install gtk2.0-dev \ ))