diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2005-09-08 00:19:37 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-09-08 00:19:37 +0000 |
| commit | bf37dc9c2e14e1c7e5c14de4d745abd191119854 (patch) | |
| tree | 17f0cdb9228adb532d472d6411bb96462dd51300 /package/jpeg/jpeg.mk | |
| parent | 6139aa18508e45b1529de87e884d25fc2400e1f9 (diff) | |
| download | buildroot-novena-bf37dc9c2e14e1c7e5c14de4d745abd191119854.tar.gz buildroot-novena-bf37dc9c2e14e1c7e5c14de4d745abd191119854.zip | |
grab some fixes from Gentoo to enable shared library support, add a jpeg-dirclean target, and cleanup the build in general
Diffstat (limited to 'package/jpeg/jpeg.mk')
| -rw-r--r-- | package/jpeg/jpeg.mk | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index b8d852489..ce40a7719 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -32,6 +32,7 @@ jpeg-source: $(DL_DIR)/$(JPEG_SOURCE) $(JPEG_DIR)/.unpacked: $(DL_DIR)/$(JPEG_SOURCE) $(JPEG_CAT) $(DL_DIR)/$(JPEG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(JPEG_DIR) package/jpeg/ jpeg\*.patch $(CONFIG_UPDATE) $(JPEG_DIR) touch $(JPEG_DIR)/.unpacked @@ -42,26 +43,19 @@ $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ - --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 \ + --prefix=$(STAGING_DIR) \ --enable-shared \ + --enable-static \ ); - touch $(JPEG_DIR)/.configured + touch $(JPEG_DIR)/.configured $(JPEG_DIR)/.libs/libjpeg.a: $(JPEG_DIR)/.configured $(MAKE) -C $(JPEG_DIR) all touch -c $(JPEG_DIR)/.libs/libjpeg.a $(STAGING_DIR)/lib/libjpeg.a: $(JPEG_DIR)/.libs/libjpeg.a - $(MAKE) -C $(JPEG_DIR) prefix=$(STAGING_DIR) exec_prefix=$(STAGING_DIR) install-headers install-lib + $(MAKE) -C $(JPEG_DIR) install-headers install-lib + rm $(STAGING_DIR)/lib/libjpeg.la touch -c $(STAGING_DIR)/lib/libjpeg.a $(TARGET_DIR)/usr/lib/libjpeg.a: $(STAGING_DIR)/lib/libjpeg.a @@ -73,6 +67,10 @@ jpeg: uclibc $(TARGET_DIR)/usr/lib/libjpeg.a jpeg-clean: -$(MAKE) -C $(JPEG_DIR) clean + +jpeg-dirclean: + rm -rf $(JPEG_DIR) + ############################################################# # # Toplevel Makefile options |