aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvektor <devnull@localhost>2002-10-28 21:20:40 (GMT)
committervektor <devnull@localhost>2002-10-28 21:20:40 (GMT)
commitab93861a6a1a9e029cbd0c33db903368f52a20b0 (patch)
treeb84433248a5ebb963431cc59079584ead26f2216
parentb2c60115baadce61f92136f9b38defc992c07cae (diff)
Fixes for make distcheck...
-rw-r--r--Makefile.am2
-rw-r--r--docs/Makefile.am2
-rw-r--r--plugins/Makefile.am6
-rw-r--r--src/Makefile.am11
-rw-r--r--src/taglines.h7
-rw-r--r--src/tvtime.c2
6 files changed, 18 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index cf8027c..72749fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
AUTOMAKE_OPTIONS = 1.6
-SUBDIRS = plugins src
+SUBDIRS = docs plugins src
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f0e73ba..9c23b91 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = DESIGN TODO default.tvtime quotes.txt
+EXTRA_DIST = DESIGN TODO default.tvtimerc quotes.txt
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 9765935..ee9bc63 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,10 +1,10 @@
-TVTIME_CFLAGS = -I../src
+TVTIME_CFLAGS = -I$(top_srcdir)/src
OPT_CFLAGS = -Wall -I. -O3 -rdynamic -g
AM_CFLAGS = $(TVTIME_CFLAGS) $(OPT_CFLAGS)
-libtvtimeplugins_a_SOURCES = greedy2frame.c twoframe.c linear.c weave.c \
- videobob.c
+libtvtimeplugins_a_SOURCES = plugins.h greedy2frame.c twoframe.c linear.c \
+ weave.c videobob.c
noinst_LIBRARIES = libtvtimeplugins.a
diff --git a/src/Makefile.am b/src/Makefile.am
index d1cf23e..1e3e817 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
tvtimedatadir = $(datadir)/tvtime
+tvtimedata_DATA = menubg.png testlogo.png FreeSansBold.ttf
TTF_CFLAGS = `freetype-config --cflags`
TTF_LIBS = `freetype-config --libs`
@@ -7,8 +8,8 @@ TTF_LIBS = `freetype-config --libs`
PNG_CFLAGS =
PNG_LIBS = -lpng -lz
-PLUGINS_CFLAGS = -I../plugins
-PLUGINS_LIBS = -L../plugins -ltvtimeplugins
+PLUGINS_CFLAGS = -I$(top_srcdir)/plugins
+PLUGINS_LIBS = -L$(top_builddir)/plugins -ltvtimeplugins
OPT_CFLAGS = -Wall -I. -O3 -rdynamic -DDATADIR="\"$(tvtimedatadir)\""
@@ -20,10 +21,12 @@ COMMON_SRCS = frequencies.c mixer.c videoinput.c sdloutput.c \
rtctimer.c ttfont.cpp efs.cpp osd.c parser.c tvtimeconf.c \
pngoutput.c tvtimeosd.c input.c cpu_accel.c speedy.c \
pnginput.c menu.c deinterlace.c videocorrection.c \
- videotools.c
+ videotools.c attributes.h deinterlace.h efs.h frequencies.h \
+ input.h menu.h mixer.h mm_accel.h mmx.h osd.h parser.h pnginput.h \
+ pngoutput.h rtctimer.h sdloutput.h speedy.h taglines.h ttfont.h \
+ tvtimeconf.h tvtimeosd.h videocorrection.h videoinput.h videotools.h
bin_PROGRAMS = tvtime
tvtime_SOURCES = $(COMMON_SRCS) tvtime.c
-tvtimedata_DATA = menubg.png testlogo.png FreeSansBold.ttf
diff --git a/src/taglines.h b/src/taglines.h
index 6a4320b..f58835b 100644
--- a/src/taglines.h
+++ b/src/taglines.h
@@ -15,13 +15,16 @@ static const char *taglines[] = {
"tvtime: taste it again, for the first time",
"a different kind of company, a different kind of tvtime",
"tvtime: for the strong, silent type",
-"tvtime: asking not what your country can do for you",
"tvtime: it does go well with the chicken",
"one small step for man... one giant leap for tvtime",
"tvtime: the deinterlacer kids ask for by name",
"tvtime: sweetened with sorbitol",
"tvtime: mark mcguire's best friend",
-"tvtime: the snack that smiles back", };
+"tvtime: the snack that smiles back, until you bite its head off",
+"tvtime: because i'm worth it",
+"tvtime: for all your 2000 parts",
+"tvtime: more than meets the eye",
+"tvtime: think different", };
static int numtaglines = ( sizeof( taglines ) / sizeof( char * ) );
diff --git a/src/tvtime.c b/src/tvtime.c
index fb06f87..664ae2b 100644
--- a/src/tvtime.c
+++ b/src/tvtime.c
@@ -42,7 +42,7 @@
#include "deinterlace.h"
#include "menu.h"
#include "videocorrection.h"
-#include "plugins/plugins.h"
+#include "plugins.h"
/**
* Warning tolerance, just for debugging.

Privacy Policy