Author: ods15
Date: Fri Sep 22 12:06:34 2006
New Revision: 139
Modified:
trunk/config.mak
trunk/libnut/Makefile
trunk/nututils/Makefile
Log:
default to static compilation
Modified: trunk/config.mak
============================================================
==================
--- trunk/config.mak (original)
+++ trunk/config.mak Fri Sep 22 12:06:34 2006
 -5,5
+5,5
CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
CC = cc
-
-
+RANLIB = ranlib
+AR = ar
Modified: trunk/libnut/Makefile
============================================================
==================
--- trunk/libnut/Makefile (original)
+++ trunk/libnut/Makefile Fri Sep 22 12:06:34 2006
-1,10
+1,13
include ../config.mak
-all: libnut.so
+all: libnut.a
+
+libnut.a: muxer.o demuxer.o reorder.o
+ rm -f $
+ $ rc $ $^
+ $(RANLIB) $
-libnut.so: muxer.o demuxer.o reorder.o
- $ $ -shared $^ -o $
.c.o: priv.h nut.h
- $ $ -fPIC $^ -c -o $
+ $ $ $^ -c -o $
clean:
rm -f *~ libnut.so *.o
Modified: trunk/nututils/Makefile
============================================================
==================
--- trunk/nututils/Makefile (original)
+++ trunk/nututils/Makefile Fri Sep 22 12:06:34 2006
-8,7
+8,7
$ $ -DAVI_PROG $^ -o $
oggreader: demux_ogg.c
$ $ -DOGG_PROG $^ -o $
-nutmerge: demux_ogg.c demux_avi.c framer_vorbis.c
framer_mpeg4.c nutmerge.c ../libnut/libnut.so # demux_nut.c
+nutmerge: demux_ogg.c demux_avi.c framer_vorbis.c
framer_mpeg4.c nutmerge.c ../libnut/libnut.a # demux_nut.c
$ $ $^ -o $
nutindex: nutindex.c
$ $ $^ -o $
_______________________________________________
NUT-devel mailing list
NUT-develmplayerhq.hu
http://lists.mplayerhq.hu/mailman/listinfo/nut-devel
|