Now using targets "install-lib" and "install-i18n" when building plugins locally

This commit is contained in:
Klaus Schmidinger 2012-12-27 13:36:25 +01:00
parent 763e6e4c49
commit c52df91e44
9 changed files with 41 additions and 10 deletions

View File

@ -7473,3 +7473,4 @@ Video Disk Recorder Revision History
the CFLAGS. the CFLAGS.
- Removed some redundancy from Make.config.template. - Removed some redundancy from Make.config.template.
- Changed "==" to "=" in the Makefile to make it POSIX style. - Changed "==" to "=" in the Makefile to make it POSIX style.
- Now using targets "install-lib" and "install-i18n" when building plugins locally.

View File

@ -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.39 2012/12/27 12:08:01 kls Exp $ # $Id: Makefile 2.40 2012/12/27 13:03:45 kls Exp $
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
@ -197,7 +197,7 @@ plugins: include-dir vdr.pc
fi;\ fi;\
target=all;\ target=all;\
if [ "$(LIBDIR)" = "$(CWD)/PLUGINS/lib" ] && [ "$(LOCDIR)" = "$(CWD)/locale" ]; then\ if [ "$(LIBDIR)" = "$(CWD)/PLUGINS/lib" ] && [ "$(LOCDIR)" = "$(CWD)/locale" ]; then\
target=install;\ target="install-lib install-i18n";\
fi;\ fi;\
includes=;\ includes=;\
if [ "$(INCDIR)" != "$(CWD)/include" ]; then\ if [ "$(INCDIR)" != "$(CWD)/include" ]; then\

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.15 2012/12/23 10:01:12 kls Exp $ # $Id: Makefile 1.16 2012/12/27 13:01:57 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -67,6 +67,10 @@ $(DEPFILE): Makefile
-include $(DEPFILE) -include $(DEPFILE)
### Internationalization (I18N):
install-i18n:
### Targets: ### Targets:
$(SOFILE): $(OBJS) $(SOFILE): $(OBJS)

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.8 2012/12/23 10:01:40 kls Exp $ # $Id: Makefile 1.9 2012/12/27 13:02:13 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -67,6 +67,10 @@ $(DEPFILE): Makefile
-include $(DEPFILE) -include $(DEPFILE)
### Internationalization (I18N):
install-i18n:
### Targets: ### Targets:
$(SOFILE): $(OBJS) $(SOFILE): $(OBJS)

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 2.11 2012/12/23 10:04:05 kls Exp $ # $Id: Makefile 2.12 2012/12/27 13:02:35 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -67,6 +67,10 @@ $(DEPFILE): Makefile
-include $(DEPFILE) -include $(DEPFILE)
### Internationalization (I18N):
install-i18n:
### Targets: ### Targets:
$(SOFILE): $(OBJS) $(SOFILE): $(OBJS)

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.8 2012/12/23 10:04:15 kls Exp $ # $Id: Makefile 1.9 2012/12/27 13:02:41 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -67,6 +67,10 @@ $(DEPFILE): Makefile
-include $(DEPFILE) -include $(DEPFILE)
### Internationalization (I18N):
install-i18n:
### Targets: ### Targets:
$(SOFILE): $(OBJS) $(SOFILE): $(OBJS)

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 2.9 2012/12/23 10:04:16 kls Exp $ # $Id: Makefile 2.10 2012/12/27 13:02:52 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -64,6 +64,10 @@ $(DEPFILE): Makefile
-include $(DEPFILE) -include $(DEPFILE)
### Internationalization (I18N):
install-i18n:
### Targets: ### Targets:
libvdr-$(PLUGIN1).so: $(PLUGIN1).o libvdr-$(PLUGIN1).so: $(PLUGIN1).o
@ -72,10 +76,12 @@ libvdr-$(PLUGIN1).so: $(PLUGIN1).o
libvdr-$(PLUGIN2).so: $(PLUGIN2).o libvdr-$(PLUGIN2).so: $(PLUGIN2).o
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@
install: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so install-lib: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
install -D libvdr-$(PLUGIN1).so $(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION) install -D libvdr-$(PLUGIN1).so $(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION)
install -D libvdr-$(PLUGIN2).so $(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION) install -D libvdr-$(PLUGIN2).so $(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION)
install: install-lib
dist: clean dist: clean
@-rm -rf $(TMPDIR)/$(ARCHIVE) @-rm -rf $(TMPDIR)/$(ARCHIVE)
@mkdir $(TMPDIR)/$(ARCHIVE) @mkdir $(TMPDIR)/$(ARCHIVE)

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 2.10 2012/12/23 10:04:43 kls Exp $ # $Id: Makefile 2.11 2012/12/27 13:03:04 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -67,6 +67,10 @@ $(DEPFILE): Makefile
-include $(DEPFILE) -include $(DEPFILE)
### Internationalization (I18N):
install-i18n:
### Targets: ### Targets:
$(SOFILE): $(OBJS) $(SOFILE): $(OBJS)

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 2.10 2012/12/23 10:04:47 kls Exp $ # $Id: Makefile 2.11 2012/12/27 13:03:07 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -67,6 +67,10 @@ $(DEPFILE): Makefile
-include $(DEPFILE) -include $(DEPFILE)
### Internationalization (I18N):
install-i18n:
### Targets: ### Targets:
$(SOFILE): $(OBJS) $(SOFILE): $(OBJS)