diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2013-01-06 18:48:29 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2013-01-06 18:48:29 +0100 |
| commit | 188fe74c8a1c917179baaf9d296c6d4eedf22c6f (patch) | |
| tree | 61d769b7d8c6348490cea7ef536de9ca6a0b6dde /PLUGINS/src/servicedemo | |
| parent | 36dfa5cb8f667c3f92d870977afcb6a1cfb91efe (diff) | |
| download | vdr-188fe74c8a1c917179baaf9d296c6d4eedf22c6f.tar.gz vdr-188fe74c8a1c917179baaf9d296c6d4eedf22c6f.tar.bz2 | |
Modified the Makefiles, by default VDR is now built according to the FHS
Diffstat (limited to 'PLUGINS/src/servicedemo')
| -rw-r--r-- | PLUGINS/src/servicedemo/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile index df4e372b..ea57fd07 100644 --- a/PLUGINS/src/servicedemo/Makefile +++ b/PLUGINS/src/servicedemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 2.12 2012/12/29 10:29:15 kls Exp $ +# $Id: Makefile 2.13 2013/01/06 10:19:53 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) +LIBDIR = $(call PKGCFG,libdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -65,7 +65,7 @@ all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so MAKEDEP = $(CXX) -MM -MG DEPFILE = .dependencies $(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ + @$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ -include $(DEPFILE) @@ -78,8 +78,8 @@ libvdr-$(PLUGIN2).so: $(PLUGIN2).o $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@ install-lib: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so - install -D libvdr-$(PLUGIN1).so $(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION) - install -D libvdr-$(PLUGIN2).so $(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION) + install -D libvdr-$(PLUGIN1).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION) + install -D libvdr-$(PLUGIN2).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION) install: install-lib |