Alexandre Julliard : makefiles: Output all the program rules explicitly for each module.
Alexandre Julliard
julliard at winehq.org
Thu Mar 25 11:44:44 CDT 2010
Module: wine
Branch: master
Commit: d7b387d376b4460214a9378359bb8a1255118634
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b387d376b4460214a9378359bb8a1255118634
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Mar 25 11:11:34 2010 +0100
makefiles: Output all the program rules explicitly for each module.
---
Makefile.in | 14 +++++---------
aclocal.m4 | 24 ++++++++++++++----------
configure | 28 ++++++++++++++--------------
3 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index bce8b39..b3dbd5e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,8 +29,6 @@ MODULE = none
ALL_DIRS = @ALL_DIRS@
ALL_DLL_DIRS = @ALL_DLL_DIRS@
-ALL_INSTALL_DIRS = @ALL_INSTALL_DIRS@
-ALL_PROGRAM_DIRS = @ALL_PROGRAM_DIRS@
ALL_STATICLIB_DIRS = @ALL_STATICLIB_DIRS@
ALL_TOOL_DIRS = @ALL_TOOL_DIRS@
ALL_TOP_DIRS = @ALL_TOP_DIRS@
@@ -41,8 +39,7 @@ BUILDSUBDIRS = \
$(ALL_TOOL_DIRS) \
$(ALL_TOP_DIRS) \
$(ALL_STATICLIB_DIRS) \
- $(ALL_DLL_DIRS) \
- $(ALL_PROGRAM_DIRS)
+ $(ALL_DLL_DIRS)
# Sub-directories to run make install/uninstall into
INSTALLSUBDIRS = \
@@ -50,8 +47,7 @@ INSTALLSUBDIRS = \
$(ALL_TOOL_DIRS) \
$(ALL_TOP_DIRS) \
$(ALL_STATICLIB_DIRS) \
- $(ALL_DLL_DIRS) \
- $(ALL_INSTALL_DIRS)
+ $(ALL_DLL_DIRS)
# Sub-directories that don't have a makefile
EXTRASUBDIRS = dlls libs
@@ -135,9 +131,6 @@ uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy
.PHONY: $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__uninstall__) \
$(INSTALLSUBDIRS:%=%/__install-lib__) $(INSTALLSUBDIRS:%=%/__install-dev__)
-uninstall::
- -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)
-
# Rules for auto documentation
DOCSUBDIRS = $(ALL_DLL_DIRS)
@@ -214,3 +207,6 @@ tags ctags:
.MAKEFILEDEPS:
@ALL_MAKEFILE_DEPENDS@
+
+uninstall::
+ -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)
diff --git a/aclocal.m4 b/aclocal.m4
index 183a81d..2ba382f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -151,9 +151,7 @@ AC_SUBST(ALL_TOP_DIRS,"")
AC_SUBST(ALL_DLL_DIRS,"")
AC_SUBST(ALL_TOOL_DIRS,"")
AC_SUBST(ALL_STATICLIB_DIRS,"")
-AC_SUBST(ALL_INSTALL_DIRS,"")
AC_SUBST(ALL_TEST_BINARIES,"")
-AC_SUBST(ALL_PROGRAM_DIRS,"")
AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
wine_fn_append_file ()
@@ -258,16 +256,22 @@ wine_fn_config_program ()
ac_install=$[3]
wine_fn_append_file ALL_DIRS programs/$ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"programs/$ac_dir programs/$ac_dir/__install__ programs/$ac_dir/__install-lib__: __builddeps__ programs/$ac_dir/Makefile
-programs/$ac_dir/__clean__ programs/$ac_dir/__install-dev__ programs/$ac_dir/__uninstall__ programs/$ac_dir: programs/$ac_dir/Makefile
+"programs/$ac_dir/__clean__: programs/$ac_dir/Makefile
programs/$ac_dir/Makefile programs/$ac_dir/__depend__: programs/$ac_dir/Makefile.in config.status programs/Makeprog.rules \$(MAKEDEP)
@./config.status --file programs/$ac_dir/Makefile && cd programs/$ac_dir && \$(MAKE) depend"
- AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_file ALL_PROGRAM_DIRS programs/$ac_dir
- case $ac_install in
- installbin) wine_fn_append_file ALL_INSTALL_DIRS programs/$ac_dir
- wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir ;;
- install) wine_fn_append_file ALL_INSTALL_DIRS programs/$ac_dir ;;
- esac])
+
+ AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+"all: programs/$ac_dir
+programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__"
+ if test -n "$ac_install"
+ then
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+"install install-lib:: programs/$ac_dir/Makefile __builddeps__
+ @cd programs/$ac_dir && \$(MAKE) install
+uninstall:: programs/$ac_dir/Makefile
+ @cd programs/$ac_dir && \$(MAKE) uninstall"
+ test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir
+ fi])
}
wine_fn_config_test ()
diff --git a/configure b/configure
index 6dae004..be8bd2c 100755
--- a/configure
+++ b/configure
@@ -597,9 +597,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
ALL_PROGRAM_BIN_INSTALL_DIRS
-ALL_PROGRAM_DIRS
ALL_TEST_BINARIES
-ALL_INSTALL_DIRS
ALL_STATICLIB_DIRS
ALL_TOOL_DIRS
ALL_DLL_DIRS
@@ -13871,12 +13869,8 @@ ALL_TOOL_DIRS=""
ALL_STATICLIB_DIRS=""
-ALL_INSTALL_DIRS=""
-
ALL_TEST_BINARIES=""
-ALL_PROGRAM_DIRS=""
-
ALL_PROGRAM_BIN_INSTALL_DIRS=""
@@ -13989,20 +13983,26 @@ wine_fn_config_program ()
ac_install=$3
wine_fn_append_file ALL_DIRS programs/$ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"programs/$ac_dir programs/$ac_dir/__install__ programs/$ac_dir/__install-lib__: __builddeps__ programs/$ac_dir/Makefile
-programs/$ac_dir/__clean__ programs/$ac_dir/__install-dev__ programs/$ac_dir/__uninstall__ programs/$ac_dir: programs/$ac_dir/Makefile
+"programs/$ac_dir/__clean__: programs/$ac_dir/Makefile
programs/$ac_dir/Makefile programs/$ac_dir/__depend__: programs/$ac_dir/Makefile.in config.status programs/Makeprog.rules \$(MAKEDEP)
@./config.status --file programs/$ac_dir/Makefile && cd programs/$ac_dir && \$(MAKE) depend"
+
eval as_val=\$$ac_enable
if test "x$as_val" = x""no; then :
else
- wine_fn_append_file ALL_PROGRAM_DIRS programs/$ac_dir
- case $ac_install in
- installbin) wine_fn_append_file ALL_INSTALL_DIRS programs/$ac_dir
- wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir ;;
- install) wine_fn_append_file ALL_INSTALL_DIRS programs/$ac_dir ;;
- esac
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+"all: programs/$ac_dir
+programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__"
+ if test -n "$ac_install"
+ then
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+"install install-lib:: programs/$ac_dir/Makefile __builddeps__
+ @cd programs/$ac_dir && \$(MAKE) install
+uninstall:: programs/$ac_dir/Makefile
+ @cd programs/$ac_dir && \$(MAKE) uninstall"
+ test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir
+ fi
fi
}
More information about the wine-cvs
mailing list