[patch] fix patch to respect LDFLAGS

urt-3.1b-build-fixes.diff (text/plain), 1.70 KB, created by Kacper Kowalik (Xarthisius) (RETIRED) on 2010-07-28 16:15:30 UTC

--- files/urt-3.1b-build-fixes.patch.orig	2010-07-28 18:13:25.000000000 +0200
+++ files/urt-3.1b-build-fixes.patch	2010-07-28 18:12:49.000000000 +0200
@@ -23,7 +23,7 @@
  
  rleClock:rleClock.o font.o
 -	${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock
-+	${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) rleClock.o font.o $(LIBS) -o rleClock -lm
  
  font.c:font.src makeFont
  	chmod +x makeFont
@@ -47,11 +47,11 @@
  
  crop.out: crop.c rle_box.o
 -	${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
-+	${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
++	$(CC) $(LDFLAGS) $(CFLAGS) crop.c rle_box.o $(LIBS) -o crop.new
  	mv crop.new crop.out
  rlebox.out: rlebox.c rle_box.o
 -	${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
-+	${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
++	$(CC) $(LDFLAGS) $(CFLAGS) rlebox.c rle_box.o $(LIBS) -o rlebox.new
  	mv rlebox.new rlebox.out
  
  # rleClock has it's own directory, must be built special
@@ -145,7 +145,18 @@
  
  rletogif.out: ${OBJ}
 -	${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new
-+	${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o rletogif.new
  	mv rletogif.new rletogif.out
  
  # Incremental install, copies executable to DEST dir.
+--- urt/get/getx11/makefile.src
++++ urt/get/getx11/makefile.src
+@@ -47,7 +47,7 @@
+ 
+ # getx11 - read RLE file to X11 display
+ getx11.out: $(X_O_FILES) 
+-	${CC} $(CFLAGS) $(X_O_FILES) $(LIBS) -o getx11.new
++	$(CC) $(LDFLAGS) $(CFLAGS) $(X_O_FILES) $(LIBS) -o getx11.new
+ 	mv getx11.new getx11.out
+ 
+ # Make prototypes.h and fn_decls.h.  Only happens if HAVE_CPROTO is defined.