[gentoo-commits] gentoo-x86 commit in x11-misc/xrmap/files: xrmap-2.33-parallel-make.patch

[gentoo-commits] gentoo-x86 commit in x11-misc/xrmap/files: xrmap-2.33-parallel-make.patch

[Kevin McCarthy (signals)]

signals     11/03/25 17:10:46

  Added:                xrmap-2.33-parallel-make.patch
  Log:
  Respect LDFLAGS, CFLAGS, CC #342211. Fix all QA warnings. Remove unneeded imake DEP. RDEPEND timidity++. Clean up (R)DEPENDS. Change default browser from dillo to xdg-open. Install current data files. Install required earthview bin/data. General ebuild cleanup.
  
  (Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-misc/xrmap/files/xrmap-2.33-parallel-make.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/files/xrmap-2.33-parallel-make.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/files/xrmap-2.33-parallel-make.patch?rev=1.1&content-type=text/plain

Index: xrmap-2.33-parallel-make.patch
===================================================================
Parallel make fixes

Patch by Kevin McCarthy <signals@gentoo.org>

--- Makefile.noimake
+++ Makefile.noimake
@@ -21,12 +21,12 @@
 
 all: explorer.o image.o xrmap.o
 	gcc -o xrmap explorer.o image.o xrmap.o $(LDOPTIONS)
-	cd editkit ; make -f Makefile.kit DESTDIR=$(DESTDIR)
-	cd earthview ; make DESTDIR=$(DESTDIR)	
+	$(MAKE) -C editkit -f Makefile.kit DESTDIR=$(DESTDIR)
+	$(MAKE) -C earthview DESTDIR=$(DESTDIR)	
 	@cat EXTRADATA
 	
 numdefs.h:
-	cd tools ; make
+	$(MAKE) -C tools
 
 explorer.o: xrmap.h version.h bitmaps.h numdefs.h menudefs.h xrmap.c
 	gcc $(CCOPTIONS) -c explorer.c
--- tools/Makefile
+++ tools/Makefile
@@ -3,16 +3,16 @@
 	./preproc > ../numdefs.h
 
 locutils:
-	cd locutils; make
+	$(MAKE) -C locutils
 
 cbd2else:
-	cd cbd2else; make
+	$(MAKE) -C cbd2else
 
 jpd2else:
-	cd jpd2else; make
+	$(MAKE) -C jpd2else
 
 rez2else:
-	cd rez2else; make
+	$(MAKE) -C rez2else
 
 world: locutils cbd2else jpd2else rez2else