diff -Nru freeboxtv-0.0.3/Makefile freeboxtv-0.0.3-Makefile/Makefile --- freeboxtv-0.0.3/Makefile 2007-09-11 18:16:10.000000000 +0200 +++ freeboxtv-0.0.3-Makefile/Makefile 2008-04-13 09:26:02.000000000 +0200 @@ -40,20 +40,22 @@ PACKAGE = vdr-$(ARCHIVE) ### Comment out the following line if you intend NOT to use the EPG feature for FreeboxTv plugin -FREEBOXTV_EPG = 1 +#FREEBOXTV_EPG = 1 ### Includes and Defines (add further entries here): -INCLUDES += -I$(VDRDIR)/include \ - -I/home/odj/dev/vdr/liveMedia/liveMedia/include \ - -I/home/odj/dev/vdr/liveMedia/groupsock/include \ - -I/home/odj/dev/vdr/liveMedia/BasicUsageEnvironment/include \ - -I/home/odj/dev/vdr/liveMedia/UsageEnvironment/include +INCLUDES += -I$(VDRDIR)/include + +INCLUDES += -I/usr/include/liveMedia -I/usr/local/include/liveMedia \ + -I/usr/include/groupsock -I/usr/local/include/groupsock \ + -I/usr/include/BasicUsageEnvironment -I/usr/local/include/BasicUsageEnvironment \ + -I/usr/include/UsageEnvironment -I/usr/local/include/UsageEnvironment + +LIBS += -lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment ifdef FREEBOXTV_EPG -INCLUDES += -I/usr/include/libxml++-2.6 -I/usr/include/glibmm-2.4 \ - -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include \ - -I/usr/lib/glibmm-2.4/include +INCLUDES += `pkg-config libxml++-2.6 --cflags` +LIBS += `pkg-config libxml++-2.6 --libs` endif DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' @@ -88,7 +90,7 @@ all: libvdr-$(PLUGIN).so libvdr-$(PLUGIN).so: $(OBJS) - $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ + $(CXX) $(CXXFLAGS) -shared $(OBJS) -L. $(LIBS) -o $@ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean