mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Added generating a pkg-config file to the Makefile
This commit is contained in:
		@@ -1924,6 +1924,7 @@ Ville Skytt
 | 
				
			|||||||
 for making the Makefile also install the include files
 | 
					 for making the Makefile also install the include files
 | 
				
			||||||
 for fixing a crash when deleting a recording while cutting it
 | 
					 for fixing a crash when deleting a recording while cutting it
 | 
				
			||||||
 for fixing several spelling errors
 | 
					 for fixing several spelling errors
 | 
				
			||||||
 | 
					 for adding generating a pkg-config file to the Makefile
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Steffen Beyer <cpunk@reactor.de>
 | 
					Steffen Beyer <cpunk@reactor.de>
 | 
				
			||||||
 for fixing setting the colored button help after deleting a recording in case the next
 | 
					 for fixing setting the colored button help after deleting a recording in case the next
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										1
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								HISTORY
									
									
									
									
									
								
							@@ -6773,3 +6773,4 @@ Video Disk Recorder Revision History
 | 
				
			|||||||
- Fixed several spelling errors (thanks to Ville Skytt<74>).
 | 
					- Fixed several spelling errors (thanks to Ville Skytt<74>).
 | 
				
			||||||
- The new SVDRP command UPDR can be used to trigger an update of the list of
 | 
					- The new SVDRP command UPDR can be used to trigger an update of the list of
 | 
				
			||||||
  recordings (thanks to Lars Hanisch).
 | 
					  recordings (thanks to Lars Hanisch).
 | 
				
			||||||
 | 
					- Added generating a pkg-config file to the Makefile (thanks to Ville Skytt<74>).
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										38
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										38
									
								
								Makefile
									
									
									
									
									
								
							@@ -4,7 +4,7 @@
 | 
				
			|||||||
# See the main source file 'vdr.c' for copyright information and
 | 
					# See the main source file 'vdr.c' for copyright information and
 | 
				
			||||||
# how to reach the author.
 | 
					# how to reach the author.
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# $Id: Makefile 2.18 2011/05/21 12:21:40 kls Exp $
 | 
					# $Id: Makefile 2.19 2011/12/04 14:09:37 kls Exp $
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.DELETE_ON_ERROR:
 | 
					.DELETE_ON_ERROR:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -33,6 +33,8 @@ CONFDIR  = $(VIDEODIR)
 | 
				
			|||||||
DOXYGEN  = /usr/bin/doxygen
 | 
					DOXYGEN  = /usr/bin/doxygen
 | 
				
			||||||
DOXYFILE = Doxyfile
 | 
					DOXYFILE = Doxyfile
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					PCDIR   ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --variable=pc_path pkg-config):$(PREFIX)/lib/pkgconfig))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include Make.global
 | 
					include Make.global
 | 
				
			||||||
-include Make.config
 | 
					-include Make.config
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -77,7 +79,7 @@ DEFINES += -DLOCDIR=\"$(LOCDIR)\"
 | 
				
			|||||||
VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
 | 
					VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
 | 
				
			||||||
APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
 | 
					APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
all: vdr i18n
 | 
					all: vdr i18n vdr.pc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Implicit rules:
 | 
					# Implicit rules:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -103,6 +105,26 @@ vdr: $(OBJS) $(SILIB)
 | 
				
			|||||||
$(SILIB):
 | 
					$(SILIB):
 | 
				
			||||||
	$(MAKE) -C $(LSIDIR) all
 | 
						$(MAKE) -C $(LSIDIR) all
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# pkg-config file:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vdr.pc: Makefile Make.global
 | 
				
			||||||
 | 
						@echo "bindir=$(BINDIR)" > $@
 | 
				
			||||||
 | 
						@echo "includedir=$(INCDIR)" >> $@
 | 
				
			||||||
 | 
						@echo "configdir=$(CONFDIR)" >> $@
 | 
				
			||||||
 | 
						@echo "videodir=$(VIDEODIR)" >> $@
 | 
				
			||||||
 | 
						@echo "plugindir=$(PLUGINLIBDIR)" >> $@
 | 
				
			||||||
 | 
						@echo "localedir=$(LOCDIR)" >> $@
 | 
				
			||||||
 | 
						@echo "apiversion=$(APIVERSION)" >> $@
 | 
				
			||||||
 | 
						@echo "cflags=$(CXXFLAGS) $(DEFINES) -I\$${includedir}" >> $@
 | 
				
			||||||
 | 
						@echo "plugincflags=\$${cflags} -fPIC" >> $@
 | 
				
			||||||
 | 
						@echo "" >> $@
 | 
				
			||||||
 | 
						@echo "Name: VDR" >> $@
 | 
				
			||||||
 | 
						@echo "Description: Video Disk Recorder" >> $@
 | 
				
			||||||
 | 
						@echo "URL: http://www.tvdr.de/" >> $@
 | 
				
			||||||
 | 
						@echo "Version: $(VDRVERSION)" >> $@
 | 
				
			||||||
 | 
						@echo "Requires: freetype2 fontconfig" >> $@
 | 
				
			||||||
 | 
						@echo "Cflags: \$${cflags}" >> $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Internationalization (I18N):
 | 
					# Internationalization (I18N):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
PODIR     = po
 | 
					PODIR     = po
 | 
				
			||||||
@@ -163,7 +185,7 @@ clean-plugins:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# Install the files:
 | 
					# Install the files:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
install: install-bin install-conf install-doc install-plugins install-i18n install-includes
 | 
					install: install-bin install-conf install-doc install-plugins install-i18n install-includes install-pc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# VDR binary:
 | 
					# VDR binary:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -200,6 +222,14 @@ install-includes: include-dir
 | 
				
			|||||||
	@mkdir -p $(DESTDIR)$(INCDIR)
 | 
						@mkdir -p $(DESTDIR)$(INCDIR)
 | 
				
			||||||
	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
 | 
						@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# pkg-config file:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					install-pc: vdr.pc
 | 
				
			||||||
 | 
						if [ -n "$(PCDIR)" ] ; then \
 | 
				
			||||||
 | 
						    mkdir -p $(DESTDIR)$(PCDIR) ; \
 | 
				
			||||||
 | 
						    cp vdr.pc $(DESTDIR)$(PCDIR) ; \
 | 
				
			||||||
 | 
						    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Source documentation:
 | 
					# Source documentation:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
srcdoc:
 | 
					srcdoc:
 | 
				
			||||||
@@ -212,7 +242,7 @@ srcdoc:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
clean:
 | 
					clean:
 | 
				
			||||||
	$(MAKE) -C $(LSIDIR) clean
 | 
						$(MAKE) -C $(LSIDIR) clean
 | 
				
			||||||
	-rm -f $(OBJS) $(DEPFILE) vdr core* *~
 | 
						-rm -f $(OBJS) $(DEPFILE) vdr vdr.pc core* *~
 | 
				
			||||||
	-rm -rf $(LOCALEDIR) $(PODIR)/*.mo $(PODIR)/*.pot
 | 
						-rm -rf $(LOCALEDIR) $(PODIR)/*.mo $(PODIR)/*.pot
 | 
				
			||||||
	-rm -rf include
 | 
						-rm -rf include
 | 
				
			||||||
	-rm -rf srcdoc
 | 
						-rm -rf srcdoc
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user