[NUT-devel] [nut]: r617 - src/trunk/Makefile

[cladisch]

Author: cladisch
Date: Wed Feb 13 09:01:58 2008
New Revision: 617

Log:
Fix the nutmerge dependencies to prevent nutmerge.h from being treated
as a source file.

Modified:
   src/trunk/Makefile

Modified: src/trunk/Makefile
==============================================================================
--- src/trunk/Makefile	(original)
+++ src/trunk/Makefile	Wed Feb 13 09:01:58 2008
@@ -2,6 +2,7 @@ include config.mak
 
 LIBNUT_OBJS = libnut/muxer.o libnut/demuxer.o libnut/reorder.o libnut/framecode.o
 NUTUTILS_PROGS = nututils/nutmerge nututils/nutindex nututils/nutparse
+NUTMERGE_OBJS = nututils/nutmerge.o nututils/demux_avi.o nututils/demux_ogg.o nututils/framer_mp3.o nututils/framer_mpeg4.o nututils/framer_vorbis.o
 
 all: libnut nututils
 
@@ -19,7 +20,8 @@ $(LIBNUT_OBJS): libnut/priv.h libnut/lib
 
 nututils: $(NUTUTILS_PROGS)
 
-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
+$(NUTMERGE_OBJS): nututils/nutmerge.h
+nututils/nutmerge: $(NUTMERGE_OBJS) libnut/libnut.a
 
 $(NUTUTILS_PROGS): CFLAGS += -Ilibnut