mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
vdr-dummydevice: remove makefile patch - no longer needed
This commit is contained in:
parent
be8673a032
commit
6f8113ced3
@ -33,20 +33,22 @@ PKG_LONGDESC="vdr dummydevice plugin"
|
|||||||
PKG_IS_ADDON="no"
|
PKG_IS_ADDON="no"
|
||||||
PKG_AUTORECONF="no"
|
PKG_AUTORECONF="no"
|
||||||
|
|
||||||
pre_configure_target() {
|
|
||||||
export CFLAGS="$CFLAGS -fPIC"
|
|
||||||
export CXXFLAGS="$CXXFLAGS -fPIC"
|
|
||||||
export LDFLAGS="$LDFLAGS -fPIC"
|
|
||||||
}
|
|
||||||
|
|
||||||
make_target() {
|
make_target() {
|
||||||
VDR_DIR=$(get_build_dir vdr)
|
VDR_DIR=$(get_build_dir vdr)
|
||||||
make VDRDIR=$VDR_DIR \
|
export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
|
||||||
|
export CPLUS_INCLUDE_PATH=$VDR_DIR/include
|
||||||
|
|
||||||
|
make \
|
||||||
LIBDIR="." \
|
LIBDIR="." \
|
||||||
LOCALEDIR="./locale"
|
LOCDIR="./locale" \
|
||||||
|
all install-i18n
|
||||||
}
|
}
|
||||||
|
|
||||||
post_make_target() {
|
post_make_target() {
|
||||||
|
VDR_DIR=$(get_build_dir vdr)
|
||||||
|
VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
|
||||||
|
|
||||||
|
cp --remove-destination libvdr*.so libvdr.so.${VDR_APIVERSION}
|
||||||
$STRIP libvdr-*.so*
|
$STRIP libvdr-*.so*
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index dc959f1..5cb2315 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -15,22 +15,15 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
|
|
||||||
|
|
||||||
### The directory environment:
|
|
||||||
|
|
||||||
-# 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 = $(call PKGCFG,libdir)
|
|
||||||
-LOCDIR = $(call PKGCFG,locdir)
|
|
||||||
-PLGCFG = $(call PKGCFG,plgcfg)
|
|
||||||
-#
|
|
||||||
TMPDIR ?= /tmp
|
|
||||||
|
|
||||||
### The compiler options:
|
|
||||||
|
|
||||||
-export CFLAGS = $(call PKGCFG,cflags)
|
|
||||||
-export CXXFLAGS = $(call PKGCFG,cxxflags)
|
|
||||||
+include $(VDRDIR)/Make.global
|
|
||||||
|
|
||||||
### The version number of VDR's plugin API:
|
|
||||||
|
|
||||||
-APIVERSION = $(call PKGCFG,apiversion)
|
|
||||||
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
|
|
||||||
|
|
||||||
### Allow user defined options to overwrite defaults:
|
|
||||||
|
|
||||||
@@ -47,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
|
|
||||||
|
|
||||||
### Includes and Defines (add further entries here):
|
|
||||||
|
|
||||||
-INCLUDES +=
|
|
||||||
+INCLUDES += -I$(VDRDIR)/include
|
|
||||||
|
|
||||||
DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
|
|
||||||
|
|
||||||
@@ -103,6 +96,7 @@ install-i18n: $(I18Nmsgs)
|
|
||||||
|
|
||||||
$(SOFILE): $(OBJS)
|
|
||||||
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
|
|
||||||
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
|
|
||||||
|
|
||||||
install-lib: $(SOFILE)
|
|
||||||
install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
|
|
Loading…
x
Reference in New Issue
Block a user