blob: a1dd00423658d09a1adc38f187b56605ce7e75c4 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
--- Makefile.in.orig Wed Apr 30 13:50:17 2003
+++ Makefile.in Fri Feb 9 16:08:03 2007
@@ -58,7 +58,7 @@
INCLUDE_TK = @V_INCLUDE_TK@
INCLUDE_TCL = @V_INCLUDE_TCL@
INCLUDE_X11 = @V_INCLUDE_X11@
-INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I../common/src
+INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I${LOCALBASE}/include/uclmmbase -I${LOCALBASE}/include
STATIC = @V_STATIC@
MKDEP = ./mkdep
@@ -89,12 +89,12 @@
OBJ_XIL = @V_OBJ_XIL@
OBJ_CRYPT = @V_OBJ_CRYPT@
LIB = $(LIB_GRABBER) @V_LIB_TK@ @V_LIB_TCL@ @V_LIB_X11@ @V_LIB@ \
- codec/tmndec/libh263.a codec/tmn-x/libh263coder.a ../common/src/libuclmmbase.a -lm
+ codec/tmndec/libh263.a codec/tmn-x/libh263coder.a -L${LOCALBASE}/lib -luclmmbase -lm
INCLUDE = $(INCLUDE_MISC) $(INCLUDE_GRABBER) $(INCLUDE_TK) $(INCLUDE_TCL) \
$(INCLUDE_X11) $(MD_INC) -Icodec/jpeg -Icodec/p64 -I.
DEFINE = @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@ -DNLAYER=8
BFLAGS = $(DEFINE) $(INCLUDE)
-CFLAGS = $(CCOPT) $(BFLAGS)
+CFLAGS += $(BFLAGS)
#
# Remember to add a dependency if you add any tcl sources here.
@@ -122,7 +122,7 @@
codec/h263/idctenc.o codec/h263/sac.o
# .c objects
-OBJ1 = net/inet.o net/inet6.o codec/cellb_tables.o tkStripchart.o md5c.o random.o \
+OBJ1 = net/inet.o net/inet6.o codec/cellb_tables.o tkStripchart.o \
$(H263_OBJS)
# session-rtpv1.o session-nv.o session-ivs.o # Not supported anymore
# .cpp objects
@@ -329,15 +329,9 @@
$(CC) -o $@ $(CFLAGS) render/ppmtolut/ppmtolut.c -lm $(STATIC)
install: force
- cp vic @prefix@/bin/vic
- chown bin @prefix@/bin/vic
- chgrp bin @prefix@/bin/vic
- chmod 555 @prefix@/bin/vic
- cp vic.1 @prefix@/man/vic.1
- cp histtolut @prefix@/bin/histtolut
- chown bin @prefix@/bin/histtolut
- chgrp bin @prefix@/bin/histtolut
- chmod 555 @prefix@/bin/histtolut
+ ${BSD_INSTALL_PROGRAM} vic @prefix@/bin/vic
+ ${BSD_INSTALL_MAN} vic.1 @prefix@/man/man1/vic.1
+ ${BSD_INSTALL_PROGRAM} histtolut @prefix@/bin/histtolut
clean:
rm -f *.o codec/jpeg/*.o codec/p64/*.o codec/h263/*.o \
@@ -410,7 +404,7 @@
codec/tmn-x/libh263coder.a:
- (cd codec/tmn-x; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" )
+ (cd codec/tmn-x; $(MAKE) CC=$(CC) CCOPT="$(CFLAGS)" )
codec/tmndec/libh263.a:
- (cd codec/tmndec; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" -f Makefile.lib)
+ (cd codec/tmndec; $(MAKE) CC=$(CC) CCOPT="$(CFLAGS)" -f Makefile.lib)
|
