Making tvheadend more standalone, #3

Makefile

@@ -1,40 +1,66 @@
 -include ../config.mak
 
-SRCS = main.c access.c dtable.c tcp.c http.c notify.c epg.c xmltv.c spawn.c
+VPATH += src
+SRCS =  main.c \
+	access.c \
+	dtable.c \
+	tcp.c \
+	http.c \
+	notify.c \
+	epg.c \
+	xmltv.c \
+	spawn.c \
+	packet.c \
+	streaming.c \
+	teletext.c \
+	channels.c \
+	subscriptions.c \
+	transports.c \
+	psi.c \
+	parsers.c \
+	parser_h264.c \
+	tsdemux.c \
+	bitstream.c \
+	htsp.c \
+	serviceprobe.c
 
-SRCS += packet.c streaming.c teletext.c
+VPATH += src/dvr
+SRCS += dvr_db.c \
+	dvr_rec.c \
+	dvr_autorec.c
 
-VPATH += dvr
-SRCS += dvr_db.c dvr_rec.c dvr_autorec.c
+VPATH += src/dvb
+SRCS += dvb.c \
+	dvb_support.c \
+	dvb_fe.c \
+	dvb_tables.c \
+	diseqc.c \
+	dvb_adapter.c \
+	dvb_multiplex.c \
+	dvb_transport.c \
+	dvb_preconf.c
 
-SRCS += htsp.c
 
-SRCS += channels.c subscriptions.c transports.c
-
-SRCS += psi.c parsers.c parser_h264.c tsdemux.c bitstream.c
-
-VPATH += dvb
-SRCS += dvb.c dvb_support.c dvb_fe.c dvb_tables.c \
-	diseqc.c dvb_adapter.c dvb_multiplex.c dvb_transport.c dvb_preconf.c
-
-SRCS += serviceprobe.c
-
-SRCS += cwc.c krypt.c
-VPATH += ffdecsa
-SRCS += FFdecsa.c
+#
+# cwc
+#
+SRCS  += cwc.c krypt.c
+VPATH += src/ffdecsa
+SRCS  += FFdecsa.c
 
 #
 # Primary web interface
 #
-
-VPATH  += webui
-SRCS   += webui.c comet.c extjs.c
+VPATH += src/webui
+SRCS += webui.c \
+	comet.c \
+	extjs.c
 
 PROGPATH = $(HTS_BUILD_ROOT)/tvheadend
 PROG = tvheadend
 MAN  = tvheadend.1
 CFLAGS += -g -Wall -Werror -funsigned-char -O2 -mmmx
-CFLAGS += -I$(INCLUDES_INSTALL_BASE) -I$(CURDIR)
+CFLAGS += -I$(INCLUDES_INSTALL_BASE) -I$(CURDIR)/src
 CFLAGS += -Wno-deprecated-declarations -Wmissing-prototypes
 CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 CFLAGS += -I$(CURDIR) -I$(INCLUDES_INSTALL_BASE)