From ca0bfd1b2dce21dbf824d094fd65e1fa9ade3721 Mon Sep 17 00:00:00 2001 From: Sascha Volkenandt <sascha (at) akv-soft (dot) de> Date: Tue, 2 Jan 2007 21:08:00 +0000 Subject: - made some more variables optional (only set if not existing in local environment) - some optical cleanups --- Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6e237e0..bae9dec 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.4 2007/01/02 20:23:45 lordjaxom Exp $ +# $Id: Makefile,v 1.5 2007/01/02 21:08:00 lordjaxom Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -27,9 +27,9 @@ LDFLAGS += `tntnet-config --libs` ### The directory environment: -VDRDIR = ../../.. -LIBDIR = ../../lib -TMPDIR = /tmp +VDRDIR ?= ../../.. +LIBDIR ?= ../../lib +TMPDIR ?= /tmp ### Allow user defined options to overwrite defaults: @@ -47,13 +47,11 @@ PACKAGE = vdr-$(ARCHIVE) ### Includes and Defines (add further entries here): INCLUDES += -I$(VDRDIR)/include -Ihttpd - DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +LIBS += httpd/libhttpd.a SUBDIRS = httpd -LIBS += httpd/libhttpd.a - ### The object files (add further files here): OBJS = $(PLUGIN).o thread.o tntconfig.o setup.o -- cgit v1.2.3