[PATCH] udev makefile broken when EXTRAS=""

[PATCH] udev makefile broken when EXTRAS=""

[Martin Hicks]

[-- Attachment #1: Type: text/plain, Size: 3079 bytes --]


Is anyone else seeing the makefile crap out when no EXTRAS are built?

I had to do the following to fix it.

-- 
Martin Hicks || mort@bork.org || PGP/GnuPG: 0x4C7F2BEE


# This is a BitKeeper generated patch for the following project:
# Project Name: udev
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.271   -> 1.272  
#	            Makefile	1.48    -> 1.49   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/12/08	mort@tomahawk.engr.sgi.com	1.272
# Fix Makefile to properly handle the case when EXTRAS is null.
# --------------------------------------------
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile	Mon Dec  8 08:15:17 2003
+++ b/Makefile	Mon Dec  8 08:15:17 2003
@@ -139,11 +139,13 @@
 CFLAGS += -I$(PWD)/libsysfs
 
 all: $(ROOT)
-	@for target in $(EXTRAS) ; do \
-		echo $$target ; \
-		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-			-C $$target $@ ; \
-	done ; \
+	@if [ "$(EXTRAS)" != "" ] ; then \
+		for target in "$(EXTRAS)" ; do \
+			echo $$target ; \
+			$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
+				-C $$target $@ ; \
+		done ; \
+	fi ; \
 
 $(ROOT): $(LIBC)
 
@@ -202,11 +204,13 @@
 	 | xargs rm -f 
 	-rm -f core $(ROOT) $(GEN_HEADERS)
 	$(MAKE) -C klibc clean
-	@for target in $(EXTRAS) ; do \
-		echo $$target ; \
-		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-			-C $$target $@ ; \
-	done ; \
+	@if [ "$(EXTRAS)" != "" ] ; then \
+		for target in "$(EXTRAS)" ; do \
+			echo $$target ; \
+			$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
+				-C $$target $@ ; \
+		done ; \
+	fi ; \
 
 DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS | grep -v "\.tdb" | grep -v "test\/sys" | sort )
 DISTDIR := $(RELEASE_NAME)
@@ -251,11 +255,13 @@
 	$(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir)
 	- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
 	- ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
-	@for target in $(EXTRAS) ; do \
-		echo $$target ; \
-		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-			-C $$target $@ ; \
-	done ; \
+	if [ "$(EXTRAS" != "" ] ; then \
+		for target in "$(EXTRAS)" ; do \
+			echo $$target ; \
+			$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
+				-C $$target $@ ; \
+		done ; \
+	fi ; \
 
 uninstall:
 	- rm $(hotplugdir)/udev.hotplug
@@ -267,10 +273,12 @@
 	- rmdir $(hotplugdir)
 	- rmdir $(configdir)
 	- rmdir $(udevdir)
-	@for target in $(EXTRAS) ; do \
-		echo $$target ; \
-		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-			-C $$target $@ ; \
-	done ; \
+	@if [ "$(EXTRAS)" != "" ] ; then \
+		for target in "$(EXTRAS)" ; do \
+			echo $$target ; \
+			$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
+				-C $$target $@ ; \
+		done ; \
+	fi ; \
 
 


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] udev makefile broken when EXTRAS=""

[Greg KH]

On Mon, Dec 08, 2003 at 11:19:08AM -0500, Martin Hicks wrote:
> 
> Is anyone else seeing the makefile crap out when no EXTRAS are built?

Nope, 'make EXTRAS=""' works just fine for me with both make version
3.79.1 and 3.80.  What version are you using?

thanks,

greg k-h


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel

Re: [PATCH] udev makefile broken when EXTRAS=""

[Martin Hicks]

[-- Attachment #1: Type: text/plain, Size: 481 bytes --]

On Tue, 2003-12-09 at 19:57, Greg KH wrote:
> On Mon, Dec 08, 2003 at 11:19:08AM -0500, Martin Hicks wrote:
> > 
> > Is anyone else seeing the makefile crap out when no EXTRAS are built?
> 
> Nope, 'make EXTRAS=""' works just fine for me with both make version
> 3.79.1 and 3.80.  What version are you using?

Never mind.  Works for me now.  Maybe I had some incomplete bk pull or
something...

Thanks
mh

-- 
Martin Hicks || mort@bork.org || PGP/GnuPG: 0x4C7F2BEE

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]