diff mbox

sofdevice cvs unused variables

Message ID 44FB2545.8070605@syphir.sytes.net
State New
Headers

Commit Message

C.Y.M Sept. 3, 2006, 6:56 p.m. UTC 
  I have been trying to clean up my builds and when updated softdevice and
softplay via cvs, noticed several warning about unused variables. Also, it
appears that softplay does not have the current Makefile fixes required to build
under the latest VDR.

Best Regards,
diff mbox

Patch

diff -ru softplay.cvs.orig/Makefile softplay.cvs/Makefile
--- softplay.cvs.orig/Makefile	2006-04-26 00:29:15.000000000 -0700
+++ softplay.cvs/Makefile	2006-04-26 00:59:27.000000000 -0700
@@ -24,7 +24,6 @@ 
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -35,7 +34,11 @@ 
 
 ### The version number of VDR (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ifeq ($(strip $(APIVERSION)),)
+   APIVERSION = $(VDRVERSION)
+endif
 
 ### The name of the distribution archive:
 
@@ -44,7 +47,7 @@ 
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(LIBFFMPEG) -I$(LIBFFMPEG)/libavformat -I$(LIBFFMPEG)/libavcodec -I$(LIBFFMPEG)/libavutil 
+INCLUDES += -I$(VDRDIR)/include -I$(LIBFFMPEG) -I$(LIBFFMPEG)/libavformat -I$(LIBFFMPEG)/libavcodec -I$(LIBFFMPEG)/libavutil 
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -79,7 +82,7 @@ 
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)