Alexandre Julliard : makefiles: Generate rules for installing l_intl.nls and wine.desktop.
Alexandre Julliard
julliard at winehq.org
Tue Feb 20 16:44:52 CST 2018
Module: wine
Branch: master
Commit: 1a49f2e044b525c40a27af63d653a9631af0c80f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a49f2e044b525c40a27af63d653a9631af0c80f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Feb 19 20:57:15 2018 +0100
makefiles: Generate rules for installing l_intl.nls and wine.desktop.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 15 +++------------
configure.ac | 15 ++-------------
loader/Makefile.in | 14 ++++++--------
tools/make_makefiles | 2 +-
tools/makedep.c | 22 ++++++++++++++++++++++
5 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/configure b/configure
index ff10f67..74935d8 100755
--- a/configure
+++ b/configure
@@ -19463,20 +19463,11 @@ $with_wine64/loader/wine-preloader:
clean::
\$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
else
- WINELOADER_INSTALL="wine.inf"
-
- wine_fn_append_rule "install install-lib::
- \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
-.PHONY: l_intl.nls/uninstall
-l_intl.nls/uninstall::
- \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls
-__uninstall__: l_intl.nls/uninstall"
+ WINELOADER_INSTALL="wine.inf l_intl.nls"
+
case $host_os in
cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;;
- *) wine_fn_append_rule "install install-lib::
- \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop
-uninstall::
- \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop" ;;
+ *) WINELOADER_INSTALL="$WINELOADER_INSTALL wine.desktop" ;;
esac
fi
diff --git a/configure.ac b/configure.ac
index d06476e..41a020b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3957,21 +3957,10 @@ $with_wine64/loader/wine-preloader:
clean::
\$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
else
- AC_SUBST(WINELOADER_INSTALL,"wine.inf")
- WINE_APPEND_RULE(
-[install install-lib::
- \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
-.PHONY: l_intl.nls/uninstall
-l_intl.nls/uninstall::
- \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls
-__uninstall__: l_intl.nls/uninstall])
+ AC_SUBST(WINELOADER_INSTALL,"wine.inf l_intl.nls")
case $host_os in
cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;;
- *) WINE_APPEND_RULE(
-[install install-lib::
- \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop
-uninstall::
- \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop]) ;;
+ *) WINELOADER_INSTALL="$WINELOADER_INSTALL wine.desktop" ;;
esac
fi
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 4fb91ff..b1eafd1 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -1,15 +1,13 @@
-C_SRCS = \
+SOURCES = \
+ l_intl.nls \
main.c \
- preloader.c
-
-MANPAGES = \
+ preloader.c \
wine.de.UTF-8.man.in \
+ wine.desktop \
wine.fr.UTF-8.man.in \
- wine.man.in \
- wine.pl.UTF-8.man.in
-
-IN_SRCS = \
wine.inf.in \
+ wine.man.in \
+ wine.pl.UTF-8.man.in \
wine_info.plist.in
PROGRAMS = $(WINELOADER_PROGRAMS)
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 0cf2344..df41356 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -435,7 +435,7 @@ sub assign_sources_to_makefiles(@)
{
next unless defined ${$make}{"TESTDLL"};
}
- else
+ elsif ($dir ne "loader") # loader dir contains misc files
{
next;
}
diff --git a/tools/makedep.c b/tools/makedep.c
index 0083661..8cd3559 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2636,6 +2636,26 @@ static void output_source_svg( struct makefile *make, struct incl_file *source,
/*******************************************************************
+ * output_source_nls
+ */
+static void output_source_nls( struct makefile *make, struct incl_file *source, const char *obj )
+{
+ add_install_rule( make, source->name, source->name,
+ strmake( "D$(datadir)/wine/%s", source->name ));
+}
+
+
+/*******************************************************************
+ * output_source_desktop
+ */
+static void output_source_desktop( struct makefile *make, struct incl_file *source, const char *obj )
+{
+ add_install_rule( make, source->name, source->name,
+ strmake( "D$(datadir)/applications/%s", source->name ));
+}
+
+
+/*******************************************************************
* output_source_po
*/
static void output_source_po( struct makefile *make, struct incl_file *source, const char *obj )
@@ -2843,6 +2863,8 @@ static const struct
{ "tlb", output_source_tlb },
{ "sfd", output_source_sfd },
{ "svg", output_source_svg },
+ { "nls", output_source_nls },
+ { "desktop", output_source_desktop },
{ "po", output_source_po },
{ "in", output_source_in },
{ "x", output_source_x },
More information about the wine-cvs
mailing list