Moved *.ecpp to pages and *.css to css subdir, added images dir

8 files changed, 96 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index 6a71c4e..1cbb2c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile,v 1.12 2007/01/03 16:22:19 lordjaxom Exp $
+# $Id: Makefile,v 1.13 2007/01/03 18:22:47 tadi Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -51,14 +51,15 @@ INCLUDES += -I$(VDRDIR)/include -Ihttpd
 DEFINES  += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 LIBS     += httpd/libhttpd.a
 
-SUBDIRS   = httpd
+SUBDIRS   = httpd pages
 
 ### The object files (add further files here):
 
 PLUGINOBJS = $(PLUGIN).o thread.o tntconfig.o setup.o i18n.o
 
 WEBOBJS = tools.o
-WEBSITE = styles.o menu.o channels.o schedule.o whats_on_now.o
+WEBLIBS = pages/libpages.a \
+	  css/libcss.a
 
 ### Default rules:
 
@@ -71,21 +72,6 @@ all: SUBDIRS libvdr-$(PLUGIN).so libtnt-$(PLUGIN).so
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-%.cpp: %.ecpp
-	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CPP) $<
-
-%.cpp: %.gif
-	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_GIF) -b $<
-
-%.cpp: %.jpg
-	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_JPG) -b $<
-
-%.cpp: %.css
-	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b $<
-
-%.cpp: %.js
-	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_JS) -b $<
-
 # Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
@@ -106,7 +92,7 @@ libvdr-$(PLUGIN).so: $(PLUGINOBJS) $(LIBS)
 	$(CXX) $(LDFLAGS) -shared -o $@ $^ $(LIBS)
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
-libtnt-$(PLUGIN).so: $(WEBOBJS) $(WEBSITE)
+libtnt-$(PLUGIN).so: $(WEBOBJS) $(WEBLIBS)
 	$(CXX) $(LDFLAGS) -shared -o $@ $^
 	@cp --remove-destination $@ $(LIBDIR)/$@
 
@@ -119,9 +105,7 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(PLUGINOBJS) $(WEBOBJS) $(WEBSITE) $(WEBSITE:%.o=%.cpp) $(DEPFILE) *.so *.tgz core* *~
+	@-rm -f $(PLUGINOBJS) $(WEBOBJS) $(DEPFILE) *.so *.tgz core* *~
 	@for dir in $(SUBDIRS); do \
 		make -C $$dir clean ; \
 	done
-
-                                        
diff --git a/css/Makefile b/css/Makefile
new file mode 100644
index 0000000..006548e
--- /dev/null
+++ b/css/Makefile
@@ -0,0 +1,39 @@
+CXX      ?= g++
+AR       ?= ar
+ECPPC    ?= ecppc
+
+CXXFLAGS ?= -O2 -Woverloaded-virtual -Wall -fPIC
+
+CXXFLAGS += `tntnet-config --cxxflags`
+LDFLAGS  += `tntnet-config --libs`
+
+INCLUDES += -I..
+
+### The directory environment:
+VDRDIR   ?= ../../../..
+
+### The object files (add further files here):
+
+OBJS	= styles.o
+
+### Default rules:
+
+.PHONY: all clean
+
+### Implicit rules:
+
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+%.cpp: %.css
+	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b $<
+
+### Targets:
+
+all: libcss.a
+
+libcss.a: $(OBJS)
+	$(AR) r $@ $^
+
+clean:
+	@rm -f *~ *.o core* libcss.a $(OBJS:%.o=%.cpp)
diff --git a/styles.css b/css/styles.css
index e3df546..e3df546 100644
--- a/styles.css
+++ b/css/styles.css
diff --git a/pages/Makefile b/pages/Makefile
new file mode 100644
index 0000000..3c77712
--- /dev/null
+++ b/pages/Makefile
@@ -0,0 +1,51 @@
+CXX      ?= g++
+AR       ?= ar
+ECPPC    ?= ecppc
+
+CXXFLAGS ?= -O2 -Woverloaded-virtual -Wall -fPIC
+
+CXXFLAGS += `tntnet-config --cxxflags`
+LDFLAGS  += `tntnet-config --libs`
+
+INCLUDES += -I..
+
+### The directory environment:
+VDRDIR   ?= ../../../..
+
+### The object files (add further files here):
+
+OBJS	= styles.o menu.o channels.o schedule.o whats_on_now.o
+
+### Default rules:
+
+.PHONY: all clean
+
+### Implicit rules:
+
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+%.cpp: %.ecpp
+	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CPP) $<
+
+%.cpp: %.gif
+	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_GIF) -b $<
+
+%.cpp: %.jpg
+	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_JPG) -b $<
+
+%.cpp: %.css
+	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b $<
+
+%.cpp: %.js
+	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_JS) -b $<
+
+### Targets:
+
+all: libpages.a
+
+libpages.a: $(OBJS)
+	$(AR) r $@ $^
+
+clean:
+	@rm -f *~ *.o core* libpages.a $(OBJS:%.o=%.cpp)
diff --git a/channels.ecpp b/pages/channels.ecpp
index aa48f03..aa48f03 100644
--- a/channels.ecpp
+++ b/pages/channels.ecpp
diff --git a/menu.ecpp b/pages/menu.ecpp
index e461ad1..e461ad1 100644
--- a/menu.ecpp
+++ b/pages/menu.ecpp
diff --git a/schedule.ecpp b/pages/schedule.ecpp
index 76659b4..76659b4 100644
--- a/schedule.ecpp
+++ b/pages/schedule.ecpp
diff --git a/whats_on_now.ecpp b/pages/whats_on_now.ecpp
index 3511105..3511105 100644
--- a/whats_on_now.ecpp
+++ b/pages/whats_on_now.ecpp