summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLarsAC <LarsAC@e10066b5-e1e2-0310-b819-94efdf66514b>2005-04-19 18:01:19 +0000
committerLarsAC <LarsAC@e10066b5-e1e2-0310-b819-94efdf66514b>2005-04-19 18:01:19 +0000
commite636aa59d86868039f39b0e39e944871cae5b9db (patch)
treef44f9f196ce7de52a2dacdff3588ec99e5d03e40 /Makefile
parent143d3397960c698935869cae65db8d8937e4d22a (diff)
downloadvdr-plugin-muggle-e636aa59d86868039f39b0e39e944871cae5b9db.tar.gz
vdr-plugin-muggle-e636aa59d86868039f39b0e39e944871cae5b9db.tar.bz2
Merged changes from 0.1.6-wr
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@637 e10066b5-e1e2-0310-b819-94efdf66514b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index f1a691a..b3d5d6f 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,10 @@ CXXFLAGS ?= -fPIC -O0 -Wall -Woverloaded-virtual -Wno-deprecated -g
### The directory environment:
-DVBDIR = ../../../../DVB
-VDRDIR = ../../../
-# /usr/local/src/VDR
-LIBDIR = ../../lib
-TMPDIR = /tmp
+DVBDIR ?= ../../../../DVB
+VDRDIR ?= ../../../
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
### Allow user defined options to overwrite defaults:
@@ -57,9 +56,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DMYSQLCLIENTVERSION='
### The object files (add further files here):
-OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_mysql.o mg_sync.o mg_thread_sync.o mg_order.o mg_content.o mg_selection.o vdr_actions.o vdr_menu.o mg_tools.o \
+OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_mysql.o mg_sync.o mg_thread_sync.o mg_order.o \
+ mg_content.o mg_selection.o vdr_actions.o vdr_menu.o mg_tools.o \
vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o \
- vdr_setup.o mg_setup.o
+ vdr_setup.o mg_setup.o mg_incremental_search.o
LIBS = -lmad $(shell taglib-config --libs)
MILIBS = $(shell taglib-config --libs)