: r617 - src/trunk/Makefile

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
 
_______________________________________________
NUT-devel mailing list
NUT-develmplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/nut-devel

On Wed, Feb 13, 2008 at 09:01:59AM +0100, cladisch wrote:
> 
> Log:
> Fix the nutmerge dependencies to prevent nutmerge.h
from being treated
> as a source file.
> 
> --- 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
>  
>  -19,7 +20,8  $(LIBNUT_OBJS): libnut/priv.h libnut/lib
>  
> -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

Is there a problem this fixes?  Because it's working
absolutely fine
here and the fix is rather ugly ...

Diego
_______________________________________________
NUT-devel mailing list
NUT-develmplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/nut-devel

On Wed, Feb 13, 2008 at 09:11:53AM +0100, Diego Biurrun
wrote:
> On Wed, Feb 13, 2008 at 09:01:59AM +0100, cladisch
wrote:
> > 
> > Log:
> > Fix the nutmerge dependencies to prevent
nutmerge.h from being treated
> > as a source file.
> > 
> > --- 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
> >  
> >  -19,7 +20,8  $(LIBNUT_OBJS): libnut/priv.h libnut/lib
> >  
> > -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
> 
> Is there a problem this fixes?  Because it's working
absolutely fine
> here and the fix is rather ugly ...

I too found it very ugly..

Rich
_______________________________________________
NUT-devel mailing list
NUT-develmplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/nut-devel

Diego Biurrun wrote:
> On Wed, Feb 13, 2008 at 09:01:59AM +0100, cladisch
wrote:
>> -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
>
> Is there a problem this fixes?

$ make
cc -Os -fomit-frame-pointer -g -Wall -D_LARGEFILE_SOURCE
-D_FILE_OFFSET_BITS=64 -Ilibnut    nututils/nutmerge.c
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   -o nututils/nutmerge
cc: compilation of header file requested
make: *** [nututils/nutmerge] Error 1

$ cc --version
gcc (GCC) 3.3.4

> Because it's working absolutely fine here and the fix
is rather ugly ...

Feel free to change it, but we cannot pretend that the .h
file is a .c file.


Regards,
Clemens
_______________________________________________
NUT-devel mailing list
NUT-develmplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/nut-devel

On Wed, Feb 13, 2008 at 09:11:53AM +0100, Diego Biurrun
wrote:
> On Wed, Feb 13, 2008 at 09:01:59AM +0100, cladisch
wrote:
> > 
> > Log:
> > Fix the nutmerge dependencies to prevent
nutmerge.h from being treated
> > as a source file.
> > 
> > --- 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
> >  
> >  -19,7 +20,8  $(LIBNUT_OBJS): libnut/priv.h libnut/lib
> >  
> > -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
> 
> Is there a problem this fixes?  Because it's working
absolutely fine
> here and the fix is rather ugly ...

Nonetheless Clemens' version captures the dependencies on
nutmerge.h
correctly.  I retract my objections.

Diego
_______________________________________________
NUT-devel mailing list
NUT-develmplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/nut-devel