*** openmhp-0.0.1b/Makefile	2005-07-20 16:56:27.000000000 +0300
--- openmhp-dev/Makefile	2005-07-26 16:46:52.000000000 +0300
***************
*** 41,46 ****
--- 41,49 ----
  
  -include $(VDRDIR)/Make.config
  
+ ### Pass down VDRDIR variable:
+ export VDRDIR
+ 
  ### 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')
*** openmhp-0.0.1b/libopenmhp/Makefile	2005-07-20 16:56:27.000000000 +0300
--- openmhp-dev/libopenmhp/Makefile	2005-07-27 12:29:12.000000000 +0300
***************
*** 1,5 ****
! CXX=g++
! CXXFLAGS=-g -c -Wall
  # -I/usr/include/libxml2
  LIBOPENMHP_DIR=$(shell pwd)
  # LIBOPENMHP_PATHNAME=$(LIBOPENMHP_DIR)/openmhp.h
--- 1,5 ----
! CXX ?= g++
! CXXFLAGS ?= -g -c -Wall
  # -I/usr/include/libxml2
  LIBOPENMHP_DIR=$(shell pwd)
  # LIBOPENMHP_PATHNAME=$(LIBOPENMHP_DIR)/openmhp.h
***************
*** 10,15 ****
--- 10,20 ----
  ### uncomment if you want to see debug printout:
  # DEFINES += -DDEBUG_LIBOPENMHP
  
+ ### Allow user defined options to overwrite defaults:
+ # (VDR dependent...)
+ -include $(VDRDIR)/../Make.config
+ 
+ 
  all: static
  
  shared: libopenmhp.so # java_jni
***************
*** 17,23 ****
  static: libopenmhp.a # java_jni
  
  libopenmhp.a: xlet.o event.o xml/handler.o xml/element.o xml/parser.o
! 	@ar rcs libopenmhp.a xlet.o event.o xml/handler.o xml/element.o xml/parser.o
  
  libopenmhp.so: xlet.o event.o xml/handler.o xml/element.o xml/parser.o
  	$(CXX) -shared -Wl,-soname,libopenmhp.so.1 \
--- 22,28 ----
  static: libopenmhp.a # java_jni
  
  libopenmhp.a: xlet.o event.o xml/handler.o xml/element.o xml/parser.o
! 	$(AR) rcs libopenmhp.a xlet.o event.o xml/handler.o xml/element.o xml/parser.o
  
  libopenmhp.so: xlet.o event.o xml/handler.o xml/element.o xml/parser.o
  	$(CXX) -shared -Wl,-soname,libopenmhp.so.1 \
***************
*** 44,47 ****
  
  clean:
  	@rm -rf *.o *.so *.a *~
! 	@rm -rf xml/*.o *~
--- 49,52 ----
  
  clean:
  	@rm -rf *.o *.so *.a *~
! 	@rm -rf xml/*.o xml/*~