aboutsummaryrefslogtreecommitdiff
path: root/package/libgtk12
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2006-07-18 08:53:30 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2006-07-18 08:53:30 +0000
commitb1d24866da633e3664800de3884e2f938289707e (patch)
tree79d6e8cbdffc8a8ca5dd8b077ef7acf7fdaa07cf /package/libgtk12
parent0216ba0b150d0a872798405c6b2c0f30b5c1ca03 (diff)
downloadbuildroot-b1d24866da633e3664800de3884e2f938289707e.tar.gz
buildroot-b1d24866da633e3664800de3884e2f938289707e.tar.bz2
fixup build dependancies and such
Diffstat (limited to 'package/libgtk12')
-rw-r--r--package/libgtk12/libgtk12.mk15
1 files changed, 10 insertions, 5 deletions
diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk
index 266d4f88c6..caa2e39eff 100644
--- a/package/libgtk12/libgtk12.mk
+++ b/package/libgtk12/libgtk12.mk
@@ -24,12 +24,15 @@ $(LIBGTK12_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK12_SOURCE)
$(LIBGTK12_DIR)/.configured: $(LIBGTK12_DIR)/.unpacked
(cd $(LIBGTK12_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
+ GLIB_CONFIG=$(STAGING_DIR)/bin/glib-config \
ac_cv_func_mmap_fixed_mapped=yes \
./configure \
--host=$(REAL_GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
+ --prefix=$(STAGING_DIR) \
+ --exec_prefix=$(STAGING_DIR) \
+ --libdir=$(STAGING_DIR)/lib \
+ --includedir=$(STAGING_DIR)/include \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
--libexecdir=/usr/lib \
@@ -41,7 +44,6 @@ $(LIBGTK12_DIR)/.configured: $(LIBGTK12_DIR)/.unpacked
$(DISABLE_NLS) \
--x-includes=$(STAGING_DIR)/usr/X11R6/include \
--x-libraries=$(STAGING_DIR)/usr/X11R6/lib \
- --with-glib-prefix=$(STAGING_DIR) \
--enable-debug=no \
--disable-glibtest \
--disable-xim \
@@ -49,10 +51,11 @@ $(LIBGTK12_DIR)/.configured: $(LIBGTK12_DIR)/.unpacked
);
touch $(LIBGTK12_DIR)/.configured
-$(LIBGTK12_DIR)/.libs/$(LIBGTK12_BINARY): $(LIBGTK12_DIR)/.configured
+$(LIBGTK12_DIR)/gtk/.libs/$(LIBGTK12_BINARY): $(LIBGTK12_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(LIBGTK12_DIR)
+ touch -c $(LIBGTK12_DIR)/gtk/.libs/$(LIBGTK12_BINARY)
-$(STAGING_DIR)/lib/$(LIBGTK12_BINARY): $(LIBGTK12_DIR)/.libs/$(LIBGTK12_BINARY)
+$(STAGING_DIR)/lib/$(LIBGTK12_BINARY): $(LIBGTK12_DIR)/gtk/.libs/$(LIBGTK12_BINARY)
$(MAKE) prefix=$(STAGING_DIR) \
exec_prefix=$(STAGING_DIR) \
bindir=$(STAGING_DIR)/bin \
@@ -68,6 +71,7 @@ $(STAGING_DIR)/lib/$(LIBGTK12_BINARY): $(LIBGTK12_DIR)/.libs/$(LIBGTK12_BINARY)
infodir=$(STAGING_DIR)/info \
mandir=$(STAGING_DIR)/man \
-C $(LIBGTK12_DIR) install;
+ touch -c $(STAGING_DIR)/lib/$(LIBGTK12_BINARY)
$(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY)
cp -a $(STAGING_DIR)/lib/libgtk.so $(TARGET_DIR)/lib/
@@ -78,6 +82,7 @@ $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY)
cp -a $(STAGING_DIR)/lib/libgdk-1.2.so.0.9.1 $(TARGET_DIR)/lib/
$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgdk-1.2.so.0.9.1
+ touch -c $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
libgtk12: uclibc libglib12 xorg $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1