summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Ahrenberg <Rolf.Ahrenberg@sci.fi>2011-03-10 21:39:43 (GMT)
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2011-03-10 23:36:37 (GMT)
commit964cd42ae44f820a1700981b74250408b688d81e (patch)
tree38b31f6662a69fc73b1193aed9207d8a9ad39e2b
parent1b0a4c38d824231222bd3059a2c8c77920fb7e6c (diff)
downloadvdr-plugin-live-964cd42ae44f820a1700981b74250408b688d81e.tar.gz
vdr-plugin-live-964cd42ae44f820a1700981b74250408b688d81e.tar.bz2
Renamed FEATURES to PLUGINFEATURES in Makefiles.
-rw-r--r--Makefile16
-rw-r--r--css/Makefile2
-rw-r--r--javascript/Makefile2
-rw-r--r--pages/Makefile4
4 files changed, 13 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 258cc62..e8bf910 100644
--- a/Makefile
+++ b/Makefile
@@ -52,10 +52,12 @@ TNTVERS7 = $(shell ver=$(TNTVERSION); if [ $$ver -ge "1606" ]; then echo "yes"
CXXFLAGS += $(shell tntnet-config --cxxflags)
LIBS += $(shell tntnet-config --libs)
+### Optional configuration features
+PLUGINFEATURES =
ifneq ($(HAVE_LIBPCRECPP),)
- FEATURES += -DHAVE_LIBPCRECPP
- CXXFLAGS += $(shell pcre-config --cflags)
- LIBS += $(HAVE_LIBPCRECPP)
+ PLUGINFEATURES += -DHAVE_LIBPCRECPP
+ CXXFLAGS += $(shell pcre-config --cflags)
+ LIBS += $(HAVE_LIBPCRECPP)
endif
### The name of the distribution archive:
@@ -98,14 +100,14 @@ all: libvdr-$(PLUGIN).so $(I18NTARG)
### Implicit rules:
%.o: %.cpp
- $(CXX) $(CXXFLAGS) -c $(DEFINES) $(FEATURES) $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) $(PLUGINFEATURES) $(INCLUDES) $<
# Dependencies:
MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies
$(DEPFILE): Makefile
- @$(MAKEDEP) $(DEFINES) $(FEATURES) $(INCLUDES) $(PLUGINOBJS:%.o=%.cpp) > $@
+ @$(MAKEDEP) $(DEFINES) $(PLUGINFEATURES) $(INCLUDES) $(PLUGINOBJS:%.o=%.cpp) > $@
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPFILE)
@@ -148,10 +150,10 @@ generate-i18n: i18n-template.h $(I18Npot) $(I18Npo) buildutil/pot2i18n.pl
subdirs: $(SUBDIRS)
$(SUBDIRS):
- @$(MAKE) -C $@ $(MAKECMDGOALS) FEATURES="$(FEATURES)"
+ @$(MAKE) -C $@ $(MAKECMDGOALS) PLUGINFEATURES="$(PLUGINFEATURES)"
PAGES:
- @$(MAKE) -C pages FEATURES="$(FEATURES)" .dependencies
+ @$(MAKE) -C pages PLUGINFEATURES="$(PLUGINFEATURES)" .dependencies
$(VERSIONSUFFIX): FORCE
./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX)
diff --git a/css/Makefile b/css/Makefile
index 9fb16ff..be9341a 100644
--- a/css/Makefile
+++ b/css/Makefile
@@ -44,7 +44,7 @@ all: libcss.a
### Implicit rules:
%.o: %.cpp
- $(CXX) $(CXXFLAGS) $(TNTFLAGS) -c $(DEFINES) $(FEATURES) $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) $(TNTFLAGS) -c $(DEFINES) $(PLUGINFEATURES) $(INCLUDES) $<
%.cpp: %.css
$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b -m "text/css" $<
diff --git a/javascript/Makefile b/javascript/Makefile
index 8f5ef13..d6b72b2 100644
--- a/javascript/Makefile
+++ b/javascript/Makefile
@@ -44,7 +44,7 @@ all: libjavascript.a
### Implicit rules:
%.o: %.cpp
- $(CXX) $(CXXFLAGS) $(TNTFLAGS) -c $(DEFINES) $(FEATURES) $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) $(TNTFLAGS) -c $(DEFINES) $(PLUGINFEATURES) $(INCLUDES) $<
%.cpp: %.js
$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_JS) -b -m "text/javascript" $<
diff --git a/pages/Makefile b/pages/Makefile
index db9436a..6a123d6 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -51,7 +51,7 @@ all: libpages.a
### Implicit rules:
%.o: %.cpp
- $(CXX) $(CXXFLAGS) $(TNTFLAGS) -c $(DEFINES) $(FEATURES) $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) $(TNTFLAGS) -c $(DEFINES) $(PLUGINFEATURES) $(INCLUDES) $<
%.cpp: %.ecpp
$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CPP) $<
@@ -61,7 +61,7 @@ all: libpages.a
MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies
$(DEPFILE): Makefile $(OBJS:%.o=%.cpp) $(OBJS:%.o=%.ecpp)
- @$(MAKEDEP) $(DEFINES) $(FEATURES) $(INCLUDES) $(OBJS:%.o=%.cpp) > $@
+ @$(MAKEDEP) $(DEFINES) $(PLUGINFEATURES) $(INCLUDES) $(OBJS:%.o=%.cpp) > $@
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPFILE)