aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:39 (GMT)
committerGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:39 (GMT)
commitbc7f101b0c874e21473aca15d9b08de8bd164392 (patch)
tree878e2a671f9bd0b3401383406a513c8056f25e17 /Makefile.in
parenta4a3e6b21da7d11e66364ab9ab67795a3f78020a (diff)
v3.75
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in24
1 files changed, 14 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in
index 584e732..22581cf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,6 @@ bindir := $(DESTDIR)@bindir@
mandir := $(DESTDIR)@mandir@
libdir := $(DESTDIR)@libdir@/xawtv
resdir := $(DESTDIR)@resdir@
-fontdir := $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc
config := @x11conf@/xawtvrc
# programs
@@ -30,8 +29,8 @@ 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@ -I/usr/X11R6/include/X11/fonts
LIB_FLAGS := -I. -I./vbistuff -I./x11 \
- -I$(srcdir)/jwz -I$(srcdir)/common \
- -I$(srcdir)/libng -I$(srcdir)/libvbi -Llibvbi -Llibng
+ -I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
+ -I$(srcdir)/libng -Llibng
# various libraries
ATHENA_LIBS := @X_LIBS@ @LIBS@ @ATHENA@
@@ -44,16 +43,19 @@ OSS_LIBS := @LIBOSS@
ALSA_LIBS := @LIBALSA@
AA_LIBS := @AALIBS@
QT_LIBS := @QTLIBS@
+VBI_LIBS := @LIBZVBI@ -lm
FS_LIBS := -L@x_libraries@ @FSLIB@
DLFLAGS := @DLFLAGS@
# stuff configure has found
FOUND_AALIB := @FOUND_AALIB@
FOUND_ALSA := @FOUND_ALSA@
+FOUND_GL := @FOUND_GL@
FOUND_LQT := @FOUND_LQT@
FOUND_MOTIF := @FOUND_MOTIF@
FOUND_OS := @FOUND_OS@
FOUND_X11 := @FOUND_X11@
+FOUND_ZVBI := @FOUND_ZVBI@
# build final cflags
CFLAGS := @CFLAGS@
@@ -65,6 +67,9 @@ CFLAGS += -DCONFIGFILE='"$(config)"'
CFLAGS += -DLIBDIR='"$(libdir)"'
CFLAGS += -DVERSION='"$(VERSION)"'
+# shared objects need -fPIC
+%.so : CFLAGS += -fPIC
+
#########################################################
# targets
@@ -100,15 +105,17 @@ realclean:: distclean
#########################################################
# some rules ...
-.SUFFIXES: .c .h .o .pic .in .ad .bdf .pcf.gz
+.SUFFIXES: .c .h .o .so .in .ad .bdf .pcf.gz
.c.o:
$(CC) $(CFLAGS) -Wp,-MD,$*.dep -c -o $@ $<
@sed -e "s|.*\.o:|$@::|" < $*.dep > $*.d && rm -f $*.dep
-.c.pic:
- $(CC) $(CFLAGS) -fPIC -Wp,-MD,$*.dep -c -o $@ $<
- @sed -e "s|.*\.o:|$@::|" < $*.dep > $*.d && rm -f $*.dep
+.o.so:
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $< $(LDLIBS)
+
+%: %.o
+ $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
.in.h:
perl -ne 's/\"/\\\"/g; chop; print "\"$$_\\n\"\n"' $< > $@
@@ -130,10 +137,8 @@ include $(srcdir)/common/Subdir.mk
# subdirs
include $(srcdir)/console/Subdir.mk
include $(srcdir)/debug/Subdir.mk
-include $(srcdir)/fonts/Subdir.mk
include $(srcdir)/libng/Subdir.mk
include $(srcdir)/libng/plugins/Subdir.mk
-include $(srcdir)/libvbi/Subdir.mk
include $(srcdir)/man/Subdir.mk
include $(srcdir)/scripts/Subdir.mk
include $(srcdir)/vbistuff/Subdir.mk
@@ -146,7 +151,6 @@ include $(srcdir)/x11/Subdir.mk
-include jwz/*.d
-include libng/*.d
-include libng/plugins/*.d
--include libvbi/*.d
-include vbistuff/*.d
-include x11/*.d

Privacy Policy