diff options
| author | Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi> | 2011-02-21 23:06:57 +0200 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2011-02-22 00:42:00 +0100 |
| commit | 45ff354dd802a9994d676eafff14499fd91d1946 (patch) | |
| tree | 0a588bd2ed2077f8380b49e6e99eb85d5550e6dc /Makefile | |
| parent | 07926dfda9e1d492f46049cf3a787106946c4690 (diff) | |
| download | vdr-plugin-live-45ff354dd802a9994d676eafff14499fd91d1946.tar.gz vdr-plugin-live-45ff354dd802a9994d676eafff14499fd91d1946.tar.bz2 | |
Added support for HAVE_LIBPCRECPP.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -25,6 +25,9 @@ ECPPC ?= ecppc CXXFLAGS ?= -fPIC -O2 -Wall LDFLAGS ?= -fPIC -g +### Check for libpcre c++ wrapper +HAVE_LIBPCRECPP = $(shell pcre-config --libs-cpp) + ### The directory environment: VDRDIR ?= ../../.. @@ -48,8 +51,12 @@ TNTVERS7 = $(shell ver=$(TNTVERSION); if [ $$ver -ge "1606" ]; then echo "yes" CXXFLAGS += $(shell tntnet-config --cxxflags) LIBS += $(shell tntnet-config --libs) -CXXFLAGS += $(shell pcre-config --cflags) -LIBS += $(shell pcre-config --libs) -lpcrecpp + +ifneq ($(HAVE_LIBPCRECPP),) + FEATURES += -DHAVE_LIBPCRECPP + CXXFLAGS += $(shell pcre-config --cflags) + LIBS += $(HAVE_LIBPCRECPP) +endif ### The name of the distribution archive: @@ -91,14 +98,14 @@ all: libvdr-$(PLUGIN).so $(I18NTARG) ### Implicit rules: %.o: %.cpp - $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXFLAGS) -c $(DEFINES) $(FEATURES) $(INCLUDES) $< # Dependencies: MAKEDEP = $(CXX) -MM -MG DEPFILE = .dependencies $(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(PLUGINOBJS:%.o=%.cpp) > $@ + @$(MAKEDEP) $(DEFINES) $(FEATURES) $(INCLUDES) $(PLUGINOBJS:%.o=%.cpp) > $@ ifneq ($(MAKECMDGOALS),clean) -include $(DEPFILE) @@ -141,10 +148,10 @@ generate-i18n: i18n-template.h $(I18Npot) $(I18Npo) buildutil/pot2i18n.pl subdirs: $(SUBDIRS) $(SUBDIRS): - $(MAKE) -C $@ $(MAKECMDGOALS) + @$(MAKE) -C $@ $(MAKECMDGOALS) FEATURES="$(FEATURES)" PAGES: - $(MAKE) -C pages .dependencies + @$(MAKE) -C pages FEATURES="$(FEATURES)" .dependencies $(VERSIONSUFFIX): FORCE ./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX) |