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

[diego]

Author: diego
Date: Sat Feb  2 14:25:05 2008
New Revision: 561

Log:
Make nututils compilation nonrecursive.


Removed:
   src/trunk/nututils/Makefile
Modified:
   src/trunk/Makefile

Modified: src/trunk/Makefile
==============================================================================
--- src/trunk/Makefile	(original)
+++ src/trunk/Makefile	Sat Feb  2 14:25:05 2008
@@ -5,8 +5,11 @@ all: libnut nututils
 libnut:
 	$(MAKE) -C libnut
 
-nututils: libnut
-	$(MAKE) -C nututils
+nututils: libnut nututils/nutmerge nututils/nutindex nututils/nutparse
+
+nututils/nutmerge: nututils/demux_avi.c nututils/demux_ogg.c nututils/framer_mp3.c nututils/framer_mpeg4.c nututils/framer_vorbis.c nututils/nutmerge.h libnut/libnut.a # nututils/demux_nut.c
+
+nututils/nutmerge nututils/nutindex nututils/nutparse: CFLAGS += -Ilibnut
 
 install:
 	install -d $(prefix)/lib