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
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
Index: xawtv-3.95/common/Subdir.mk
===================================================================
--- xawtv-3.95.orig/common/Subdir.mk 2003-02-14 15:14:04.000000000 +0100
+++ xawtv-3.95/common/Subdir.mk 2011-02-26 22:40:51.864893305 +0100
@@ -17,7 +17,7 @@
# RegEdit.c is good old K&R ...
common/RegEdit.o: CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
-common/channel-no-x11.o: CFLAGS += -DNO_X11=1
+common/channel-no-x11.o: DEFS += -DNO_X11=1
common/channel-no-x11.o: common/channel.c
@$(echo_compile_c)
Index: xawtv-3.95/configure.ac
===================================================================
--- xawtv-3.95.orig/configure.ac 2011-02-26 22:40:51.814868305 +0100
+++ xawtv-3.95/configure.ac 2011-02-26 22:40:51.864893305 +0100
@@ -150,6 +150,12 @@
ATHENA=""
FSLIB=""
fi
+if test "x$x_includes" = "x"; then
+ x_includes=/usr/X11R6/include
+fi
+if test "x$x_libraries" = "x"; then
+ x_libraries=/usr/X11R6/lib
+fi
AC_SUBST(X_CFLAGS)
AC_SUBST(X_PRE_LIBS)
AC_SUBST(X_EXTRA_LIBS)
Index: xawtv-3.95/console/Subdir.mk
===================================================================
--- xawtv-3.95.orig/console/Subdir.mk 2003-02-14 15:14:04.000000000 +0100
+++ xawtv-3.95/console/Subdir.mk 2011-02-26 22:44:38.017913306 +0100
@@ -84,11 +84,11 @@
console/v4l-conf : LDLIBS += $(ATHENA_LIBS)
# linker flags
-console/fbtv : LDFLAGS := $(DLFLAGS)
-console/ttv : LDFLAGS := $(DLFLAGS)
-console/scantv : LDFLAGS := $(DLFLAGS)
-console/streamer : LDFLAGS := $(DLFLAGS)
-console/webcam : LDFLAGS := $(DLFLAGS)
+console/fbtv : LDLIBS += $(DLFLAGS)
+console/ttv : LDLIBS += $(DLFLAGS)
+console/scantv : LDLIBS += $(DLFLAGS)
+console/streamer : LDLIBS += $(DLFLAGS)
+console/webcam : LDLIBS += $(DLFLAGS)
# global targets
all:: $(TARGETS-console) $(TARGETS-v4l-conf)
@@ -96,7 +96,7 @@
install::
$(INSTALL_PROGRAM) $(TARGETS-console) $(bindir)
ifeq ($(FOUND_OS),linux)
- $(INSTALL_PROGRAM) $(SUID_ROOT) $(TARGETS-v4l-conf) $(bindir)
+ $(INSTALL_PROGRAM) $(TARGETS-v4l-conf) $(bindir)
endif
distclean::
Index: xawtv-3.95/libng/contrib-plugins/Subdir.mk
===================================================================
--- xawtv-3.95.orig/libng/contrib-plugins/Subdir.mk 2003-02-14 15:14:05.000000000 +0100
+++ xawtv-3.95/libng/contrib-plugins/Subdir.mk 2011-02-26 22:40:51.864893305 +0100
@@ -18,7 +18,7 @@
# linear-blend has mmx support ...
ifeq ($(USE_MMX),yes)
-libng/contrib-plugins/linear-blend.so : CFLAGS += -DMMX=1
+libng/contrib-plugins/linear-blend.so : DEFS += -DMMX=1
endif
# global targets
Index: xawtv-3.95/Makefile.in
===================================================================
--- xawtv-3.95.orig/Makefile.in 2004-04-22 16:52:29.000000000 +0200
+++ xawtv-3.95/Makefile.in 2011-02-26 22:40:51.864893305 +0100
@@ -28,12 +28,13 @@
# for CFLAGS
WARN_FLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
-LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts
-LIB_FLAGS := -I. -I./vbistuff -I./x11 \
+LFS_DEFS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+X11_DEFS := @X_CFLAGS@ @XFT_FLAGS@ -I@x_includes@/X11/fonts -I@x_includes@/X11/FS
+LIB_DEFS := -I. -I./vbistuff -I./x11 \
-I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
-I$(srcdir)/x11 -I$(srcdir)/structs \
- -I$(srcdir)/libng -Llibng
+ -I$(srcdir)/libng
+LIB_LIBS := -Llibng
# various libraries
ATHENA_LIBS := @X_LIBS@ @XFT_LIBS@ @LIBS@ @ATHENA@
@@ -67,24 +68,25 @@
# build final cflags
CFLAGS := @CFLAGS@
CFLAGS += $(WARN_FLAGS)
-CFLAGS += $(LFS_FLAGS)
-CFLAGS += $(X11_FLAGS)
-CFLAGS += $(LIB_FLAGS)
-CFLAGS += -DCONFIGFILE='"$(config)"'
-CFLAGS += -DLIBDIR='"$(libdir)"'
-CFLAGS += -DDATADIR='"$(datadir)"'
-CFLAGS += -DVERSION='"$(VERSION)"'
+DEFS += $(LFS_DEFS)
+DEFS += $(X11_DEFS)
+DEFS += $(LIB_DEFS)
+DEFS += -DCONFIGFILE='"$(config)"'
+DEFS += -DLIBDIR='"$(libdir)"'
+DEFS += -DDATADIR='"$(datadir)"'
+DEFS += -DVERSION='"$(VERSION)"'
CXXFLAGS := $(CFLAGS)
# for gcc3
#CFLAGS += -std-gnu99
# shared objects need -fPIC
-%.so : CFLAGS += -fPIC
-%.so : CXXFLAGS += -fPIC
+%.so : DEFS += -fPIC
# libraries
+LDFLAGS := @LDFLAGS@
LDLIBS := @LDLIBS@
+LDLIBS += $(LIB_LIBS)
#########################################################
Index: xawtv-3.95/mk/Compile.mk
===================================================================
--- xawtv-3.95.orig/mk/Compile.mk 2003-02-14 15:14:08.000000000 +0100
+++ xawtv-3.95/mk/Compile.mk 2011-02-26 22:40:51.864893305 +0100
@@ -20,8 +20,8 @@
depfile = mk/$(subst /,_,$*).dep
depfiles = mk/*.dep
-compile_c = $(CC) $(CFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
-compile_cc = $(CXX) $(CXXFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
+compile_c = $(CC) $(CFLAGS) $(DEFS) -Wp,-MD,$(tmpdep) -c -o $@ $<
+compile_cc = $(CXX) $(CXXFLAGS) $(DEFS) -Wp,-MD,$(tmpdep) -c -o $@ $<
fixup_deps = sed -e "s|.*\.o:|$@:|" < $(tmpdep) > $(depfile) && rm -f $(tmpdep)
link_app = $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
Index: xawtv-3.95/x11/Subdir.mk
===================================================================
--- xawtv-3.95.orig/x11/Subdir.mk 2005-01-05 11:25:03.000000000 +0100
+++ xawtv-3.95/x11/Subdir.mk 2011-02-26 22:40:51.864893305 +0100
@@ -110,15 +110,15 @@
x11/propwatch : LDLIBS += $(ATHENA_LIBS)
# linker flags
-x11/xawtv : LDFLAGS := $(DLFLAGS)
-x11/motv : LDFLAGS := $(DLFLAGS)
-x11/mtt : LDFLAGS := $(DLFLAGS)
-x11/v4lctl : LDFLAGS := $(DLFLAGS)
-x11/pia : LDFLAGS := $(DLFLAGS)
+x11/xawtv : LDFLAGS += $(DLFLAGS)
+x11/motv : LDFLAGS += $(DLFLAGS)
+x11/mtt : LDFLAGS += $(DLFLAGS)
+x11/v4lctl : LDFLAGS += $(DLFLAGS)
+x11/pia : LDFLAGS += $(DLFLAGS)
# compile flags
-x11/complete-xaw.o : CFLAGS += -DATHENA=1
-x11/complete-motif.o : CFLAGS += -DMOTIF=1
+x11/complete-xaw.o : DEFS += -DATHENA=1
+x11/complete-motif.o : DEFS += -DMOTIF=1
# i18n
|
