Alexandre Julliard : makefiles: Use the generic install flags for the static libraries.

Alexandre Julliard julliard at winehq.org
Mon Jun 13 11:49:16 CDT 2011


Module: wine
Branch: master
Commit: a0b8fa9f97b115274d863e8c22bdb1b99b0ffb95
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a0b8fa9f97b115274d863e8c22bdb1b99b0ffb95

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sun Jun 12 12:44:03 2011 +0200

makefiles: Use the generic install flags for the static libraries.

---

 aclocal.m4 |   15 +++++----------
 configure  |   15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 6dd0361..18b920b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -204,9 +204,10 @@ wine_fn_config_makefile ()
     ac_dir=$[1]
     ac_enable=$[2]
     ac_flags=$[3]
+    ac_rules=$[4]
     AS_VAR_IF([$ac_enable],[no],[return 0])
 
-    wine_fn_all_dir_rules $ac_dir Make.rules
+    wine_fn_all_dir_rules $ac_dir ${ac_rules:-Make.rules}
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "all: $ac_dir
 .PHONY: $ac_dir
@@ -241,15 +242,9 @@ wine_fn_config_lib ()
     ac_name=$[1]
     ac_flags=$[2]
     ac_dir=dlls/$ac_name
-    wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules
-    wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all __builddeps__: $ac_dir
-$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy
-	@cd $ac_dir && \$(MAKE)
-install install-dev:: $ac_dir
-	@cd $ac_dir && \$(MAKE) install
-uninstall:: $ac_dir/Makefile
-	@cd $ac_dir && \$(MAKE) uninstall"
+    wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir"
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include"
 }
 
 wine_fn_config_dll ()
diff --git a/configure b/configure
index e0afaa6..1bdae44 100755
--- a/configure
+++ b/configure
@@ -14569,11 +14569,12 @@ wine_fn_config_makefile ()
     ac_dir=$1
     ac_enable=$2
     ac_flags=$3
+    ac_rules=$4
     if eval test \"x\$"$ac_enable"\" = x"no"; then :
   return 0
 fi
 
-    wine_fn_all_dir_rules $ac_dir Make.rules
+    wine_fn_all_dir_rules $ac_dir ${ac_rules:-Make.rules}
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "all: $ac_dir
 .PHONY: $ac_dir
@@ -14608,15 +14609,9 @@ wine_fn_config_lib ()
     ac_name=$1
     ac_flags=$2
     ac_dir=dlls/$ac_name
-    wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules
-    wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"all __builddeps__: $ac_dir
-$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy
-	@cd $ac_dir && \$(MAKE)
-install install-dev:: $ac_dir
-	@cd $ac_dir && \$(MAKE) install
-uninstall:: $ac_dir/Makefile
-	@cd $ac_dir && \$(MAKE) uninstall"
+    wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir"
+    wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include"
 }
 
 wine_fn_config_dll ()




More information about the wine-cvs mailing list