From 5cd3395975f687ba8390fddda38bd110d98b30ed Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 29 Oct 2015 14:43:54 +0900 Subject: [PATCH] makefiles: Generate rules for installing scripts. Signed-off-by: Alexandre Julliard --- tools/makedep.c | 6 ++++++ tools/winedump/Makefile.in | 9 ++------- tools/winemaker/Makefile.in | 10 +++------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9a21397003b..ffd286f57b3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -150,6 +150,7 @@ struct makefile struct strarray include_args; struct strarray define_args; struct strarray programs; + struct strarray scripts; struct strarray appmode; struct strarray imports; struct strarray delayimports; @@ -2488,6 +2489,10 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t strmake( "p$(bindir)/%s", program )); } + for (i = 0; i < make->scripts.count; i++) + add_install_rule( make, make->scripts.str[i], make->scripts.str[i], + strmake( "S$(bindir)/%s", make->scripts.str[i] )); + if (all_targets.count) { output( "all:" ); @@ -2775,6 +2780,7 @@ static void update_makefile( const char *path ) make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); make->programs = get_expanded_make_var_array( make, "PROGRAMS" ); + make->scripts = get_expanded_make_var_array( make, "SCRIPTS" ); make->appmode = get_expanded_make_var_array( make, "APPMODE" ); make->imports = get_expanded_make_var_array( make, "IMPORTS" ); make->delayimports = get_expanded_make_var_array( make, "DELAYIMPORTS" ); diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index a93f078eeb6..b55ac72f6d4 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -1,5 +1,6 @@ PROGRAMS = winedump MANPAGES = winedump.man.in +SCRIPTS = function_grep.pl C_SRCS = \ debug.c \ @@ -23,10 +24,4 @@ C_SRCS = \ symbol.c \ tlb.c -INSTALL_DEV = $(PROGRAMS) - -install install-dev:: - $(INSTALL_SCRIPT) $(srcdir)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/function_grep.pl +INSTALL_DEV = $(PROGRAMS) $(SCRIPTS) diff --git a/tools/winemaker/Makefile.in b/tools/winemaker/Makefile.in index 6afa0166848..37e345dd792 100644 --- a/tools/winemaker/Makefile.in +++ b/tools/winemaker/Makefile.in @@ -1,12 +1,8 @@ +SCRIPTS = winemaker + MANPAGES = \ winemaker.de.UTF-8.man.in \ winemaker.fr.UTF-8.man.in \ winemaker.man.in -INSTALL_DEV = winemaker - -install install-dev:: - $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker +INSTALL_DEV = $(SCRIPTS)