summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2007-01-04 23:04:57 +0000
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2007-01-04 23:04:57 +0000
commit8076167dfeb68366c26b559aac9b1185e119cea2 (patch)
tree6fc1d0e2395b1150d99831e146c8012c1397ed16
parent6c6634cd6d03ccb3ac8004a99ba984a35e207334 (diff)
downloadvdr-plugin-live-8076167dfeb68366c26b559aac9b1185e119cea2.tar.gz
vdr-plugin-live-8076167dfeb68366c26b559aac9b1185e119cea2.tar.bz2
Added Makefile for new javascript directory
-rw-r--r--Makefile11
-rw-r--r--javascript/Makefile40
-rw-r--r--pages/recordings.ecpp2
3 files changed, 48 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7bfe495..670a3df 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile,v 1.21 2007/01/04 15:02:00 lordjaxom Exp $
+# $Id: Makefile,v 1.22 2007/01/04 23:04:57 tadi Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -54,14 +54,17 @@ export DEFINES
LIBS += httpd/libhttpd.a
-SUBDIRS = httpd pages css images pagelib
+SUBDIRS = httpd pagelib pages css images javascript
### The object files (add further files here):
PLUGINOBJS = $(PLUGIN).o thread.o tntconfig.o setup.o i18n.o timers.o
-WEBLIBS = pages/libpages.a css/libcss.a images/libimages.a pagelib/libpagelib.a
-
+WEBLIBS = \
+ pagelib/libpagelib.a \
+ pages/libpages.a \
+ css/libcss.a \
+ images/libimages.a
### Default rules:
diff --git a/javascript/Makefile b/javascript/Makefile
new file mode 100644
index 0000000..6dc97cd
--- /dev/null
+++ b/javascript/Makefile
@@ -0,0 +1,40 @@
+CXX ?= g++
+AR ?= ar
+ECPPC ?= ecppc
+
+CXXFLAGS ?= -O2 -Woverloaded-virtual -Wall -fPIC
+
+CXXFLAGS += `tntnet-config --cxxflags`
+LDFLAGS += `tntnet-config --libs`
+
+INCLUDES += -I.. -I../pagelib -I$(VDRDIR)/include
+
+### The directory environment:
+
+VDRDIR ?= ../../../..
+
+### The object files (add further files here):
+
+OBJS = alphaAPI.o domLib.o domTT_drag.o domTT.o fadomatic.o
+
+### Default rules:
+
+.PHONY: all clean
+
+all: libjavascript.a
+
+### Implicit rules:
+
+%.o: %.cpp
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+%.cpp: %.js
+ $(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_JS) -b -m "test/javascript" $<
+
+### Targets:
+
+libjavascript.a: $(OBJS)
+ $(AR) r $@ $^
+
+clean:
+ @rm -f *~ *.o core* libjavascript.a $(OBJS:%.o=%.cpp)
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 9a51b1f..17b6ae1 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -1,9 +1,9 @@
<%pre>
#include <vdr/plugin.h>
-#include <vdr/recording.h>
#include <vdr/config.h>
#include <vdr/i18n.h>
#include "tools.h"
+#include "recordings.h"
using namespace vdrlive;