[NUT-devel] [nut]: r536 - in src/trunk: Makefile libnut/Makefile nututils/Makefile

[diego]

Author: diego
Date: Fri Feb  1 16:33:53 2008
New Revision: 536

Log:
Get rid of ugly {} in Makefiles.


Modified:
   src/trunk/Makefile
   src/trunk/libnut/Makefile
   src/trunk/nututils/Makefile

Modified: src/trunk/Makefile
==============================================================================
--- src/trunk/Makefile	(original)
+++ src/trunk/Makefile	Fri Feb  1 16:33:53 2008
@@ -3,12 +3,12 @@ include config.mak
 all: libnut nututils
 
 libnut: FORCE
-	${MAKE} -C libnut
+	$(MAKE) -C libnut
 nututils: libnut FORCE
-	${MAKE} -C nututils
+	$(MAKE) -C nututils
 
 install:
-	${MAKE} -C libnut install
+	$(MAKE) -C libnut install
 
 
 distclean: clean

Modified: src/trunk/libnut/Makefile
==============================================================================
--- src/trunk/libnut/Makefile	(original)
+++ src/trunk/libnut/Makefile	Fri Feb  1 16:33:53 2008
@@ -14,13 +14,13 @@ uninstall:
 	rm -f $(prefix)/lib/libnut.a
 	rm -f $(prefix)/include/libnut.h
 
-libnut.a: ${OBJS}
+libnut.a: $(OBJS)
 	rm -f $@
-	${AR} rc $@ $^
+	$(AR) rc $@ $^
 	$(RANLIB) $@
 
-libnut.so: ${OBJS}
-	${CC} ${CFLAGS} -shared $^ -o $@
+libnut.so: $(OBJS)
+	$(CC) $(CFLAGS) -shared $^ -o $@
 
 *.o: priv.h libnut.h
 

Modified: src/trunk/nututils/Makefile
==============================================================================
--- src/trunk/nututils/Makefile	(original)
+++ src/trunk/nututils/Makefile	Fri Feb  1 16:33:53 2008
@@ -5,15 +5,15 @@ CFLAGS += -I../libnut -lm
 all: avireader nutmerge nutindex nutparse # oggreader
 
 avireader: demux_avi.c
-	${CC} ${CFLAGS} -DAVI_PROG $^ -o $@
+	$(CC) $(CFLAGS) -DAVI_PROG $^ -o $@
 oggreader: demux_ogg.c
-	${CC} ${CFLAGS} -DOGG_PROG $^ -o $@
+	$(CC) $(CFLAGS) -DOGG_PROG $^ -o $@
 nutmerge: demux_ogg.c demux_avi.c framer_vorbis.c framer_mp3.c framer_mpeg4.c nutmerge.c ../libnut/libnut.a # demux_nut.c
-	${CC} ${CFLAGS} $^ -o $@
+	$(CC) $(CFLAGS) $^ -o $@
 nutindex: nutindex.c
-	${CC} ${CFLAGS} $^ -o $@
+	$(CC) $(CFLAGS) $^ -o $@
 nutparse: nutparse.c
-	${CC} ${CFLAGS} $^ -o $@
+	$(CC) $(CFLAGS) $^ -o $@
 
 clean:
 	rm -f *\~ nutmerge nutindex nutparse avireader oggreader *.o