From d06645d8eddce3a22144a9ef8961a8f7599d319e Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 10 Feb 2005 03:06:39 +0000 Subject: There is no need to have a separate 'Makefile.in' file in the general case, therefore, combine the toplevel Makefile options such as setting TARGETS into the per-package *.mk file --- package/jpeg/Makefile.in | 3 --- package/jpeg/jpeg.mk | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 package/jpeg/Makefile.in (limited to 'package/jpeg') diff --git a/package/jpeg/Makefile.in b/package/jpeg/Makefile.in deleted file mode 100644 index 87705f733..000000000 --- a/package/jpeg/Makefile.in +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(strip $(BR2_PACKAGE_JPEG)),y) -TARGETS+=jpeg -endif diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index 9b4f5ff48..8f0a0dbf8 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -72,3 +72,11 @@ jpeg: uclibc $(TARGET_DIR)/usr/lib/libjpeg.so.62.0.0 jpeg-clean: -$(MAKE) -C $(JPEG_DIR) clean +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_JPEG)),y) +TARGETS+=jpeg +endif -- cgit v1.2.3