1 --- tmp/base/xawtv-3.93-r0/xawtv-3.93/common/Subdir.mk 2003-02-14 09:14:04.000000000 -0500
2 +++ xawtv-3.93/common/Subdir.mk 2004-06-08 16:50:35.382555000 -0400
5 # RegEdit.c is good old K&R ...
6 common/RegEdit.o: CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
7 -common/channel-no-x11.o: CFLAGS += -DNO_X11=1
8 +common/channel-no-x11.o: DEFS += -DNO_X11=1
10 common/channel-no-x11.o: common/channel.c
12 --- tmp/base/xawtv-3.93-r0/xawtv-3.93/configure.ac 2004-03-10 11:34:37.000000000 -0500
13 +++ xawtv-3.93/configure.ac 2004-06-08 17:01:42.023414000 -0400
18 +if test "x$x_includes" = "x"; then
19 + x_includes=/usr/X11R6/include
21 +if test "x$x_libraries" = "x"; then
22 + x_libraries=/usr/X11R6/lib
26 AC_SUBST(X_EXTRA_LIBS)
27 --- tmp/base/xawtv-3.93-r0/xawtv-3.93/console/Subdir.mk 2003-02-14 09:14:04.000000000 -0500
28 +++ xawtv-3.93/console/Subdir.mk 2004-06-08 16:54:22.296488000 -0400
30 console/v4l-conf : LDLIBS += $(ATHENA_LIBS)
33 -console/fbtv : LDFLAGS := $(DLFLAGS)
34 -console/ttv : LDFLAGS := $(DLFLAGS)
35 -console/scantv : LDFLAGS := $(DLFLAGS)
36 -console/streamer : LDFLAGS := $(DLFLAGS)
37 -console/webcam : LDFLAGS := $(DLFLAGS)
38 +console/fbtv : LDLIBS += $(DLFLAGS)
39 +console/ttv : LDLIBS += $(DLFLAGS)
40 +console/scantv : LDLIBS += $(DLFLAGS)
41 +console/streamer : LDLIBS += $(DLFLAGS)
42 +console/webcam : LDLIBS += $(DLFLAGS)
45 all:: $(TARGETS-console) $(TARGETS-v4l-conf)
46 --- tmp/base/xawtv-3.93-r0/xawtv-3.93/libng/contrib-plugins/Subdir.mk 2003-02-14 09:14:05.000000000 -0500
47 +++ xawtv-3.93/libng/contrib-plugins/Subdir.mk 2004-06-08 16:53:10.545928000 -0400
50 # linear-blend has mmx support ...
52 -libng/contrib-plugins/linear-blend.so : CFLAGS += -DMMX=1
53 +libng/contrib-plugins/linear-blend.so : DEFS += -DMMX=1
57 --- tmp/base/xawtv-3.93-r0/xawtv-3.93/Makefile.in 2004-04-22 10:52:29.000000000 -0400
58 +++ xawtv-3.93/Makefile.in 2004-06-08 17:06:40.828711000 -0400
62 WARN_FLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
63 -LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
64 -X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts
65 -LIB_FLAGS := -I. -I./vbistuff -I./x11 \
66 +LFS_DEFS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
67 +X11_DEFS := @X_CFLAGS@ @XFT_FLAGS@ -I@x_includes@/X11/fonts -I@x_includes@/X11/FS
68 +LIB_DEFS := -I. -I./vbistuff -I./x11 \
69 -I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
70 -I$(srcdir)/x11 -I$(srcdir)/structs \
71 - -I$(srcdir)/libng -Llibng
76 ATHENA_LIBS := @X_LIBS@ @XFT_LIBS@ @LIBS@ @ATHENA@
80 CFLAGS += $(WARN_FLAGS)
81 -CFLAGS += $(LFS_FLAGS)
82 -CFLAGS += $(X11_FLAGS)
83 -CFLAGS += $(LIB_FLAGS)
84 -CFLAGS += -DCONFIGFILE='"$(config)"'
85 -CFLAGS += -DLIBDIR='"$(libdir)"'
86 -CFLAGS += -DDATADIR='"$(datadir)"'
87 -CFLAGS += -DVERSION='"$(VERSION)"'
91 +DEFS += -DCONFIGFILE='"$(config)"'
92 +DEFS += -DLIBDIR='"$(libdir)"'
93 +DEFS += -DDATADIR='"$(datadir)"'
94 +DEFS += -DVERSION='"$(VERSION)"'
100 # shared objects need -fPIC
101 -%.so : CFLAGS += -fPIC
102 -%.so : CXXFLAGS += -fPIC
103 +%.so : DEFS += -fPIC
106 +LDFLAGS := @LDFLAGS@
108 +LDLIBS += $(LIB_LIBS)
111 #########################################################
112 --- tmp/base/xawtv-3.93-r0/xawtv-3.93/mk/Compile.mk 2003-02-14 09:14:08.000000000 -0500
113 +++ xawtv-3.93/mk/Compile.mk 2004-06-08 16:53:52.030861000 -0400
115 depfile = mk/$(subst /,_,$*).dep
118 -compile_c = $(CC) $(CFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
119 -compile_cc = $(CXX) $(CXXFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
120 +compile_c = $(CC) $(CFLAGS) $(DEFS) -Wp,-MD,$(tmpdep) -c -o $@ $<
121 +compile_cc = $(CXX) $(CXXFLAGS) $(DEFS) -Wp,-MD,$(tmpdep) -c -o $@ $<
122 fixup_deps = sed -e "s|.*\.o:|$@:|" < $(tmpdep) > $(depfile) && rm -f $(tmpdep)
124 link_app = $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
125 --- tmp/base/xawtv-3.93-r0/xawtv-3.93/x11/Subdir.mk 2004-01-12 12:56:17.000000000 -0500
126 +++ xawtv-3.93/x11/Subdir.mk 2004-06-08 16:53:36.097733000 -0400
127 @@ -110,14 +110,14 @@
128 x11/propwatch : LDLIBS += $(ATHENA_LIBS)
131 -x11/xawtv : LDFLAGS := $(DLFLAGS)
132 -x11/motv : LDFLAGS := $(DLFLAGS)
133 -x11/v4lctl : LDFLAGS := $(DLFLAGS)
134 -x11/pia : LDFLAGS := $(DLFLAGS)
135 +x11/xawtv : LDLIBS += $(DLFLAGS)
136 +x11/motv : LDLIBS += $(DLFLAGS)
137 +x11/v4lctl : LDLIBS += $(DLFLAGS)
138 +x11/pia : LDLIBS += $(DLFLAGS)
141 -x11/complete-xaw.o : CFLAGS += -DATHENA=1
142 -x11/complete-motif.o : CFLAGS += -DMOTIF=1
143 +x11/complete-xaw.o : DEFS += -DATHENA=1
144 +x11/complete-motif.o : DEFS += -DMOTIF=1