aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrich Mueller2012-10-05 20:42:28 -0400
committerGlenn Morris2012-10-05 20:42:28 -0400
commit150798c5ac7953c0fd56cffd3b3720015528d820 (patch)
treee5420302cb47e611ed491cc213fd31c9177e2f5d
parent7fa36ccb71d0def28bc3f8eb17827fc870bd7ca2 (diff)
downloademacs-150798c5ac7953c0fd56cffd3b3720015528d820.tar.gz
emacs-150798c5ac7953c0fd56cffd3b3720015528d820.zip
Let configure set ar and associated flags
* lwlib/Makefile.in (AR, ARFLAGS): * oldXMenu/Makefile.in (AR, ARFLAGS): Get values from configure. Fixes: debbugs:12549
-rw-r--r--lwlib/ChangeLog4
-rw-r--r--lwlib/Makefile.in5
-rw-r--r--oldXMenu/ChangeLog4
-rw-r--r--oldXMenu/Makefile.in6
4 files changed, 14 insertions, 5 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 7d49d9b531b..80d29bc5d8a 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,7 @@
12012-10-06 Ulrich Müller <ulm@gentoo.org>
2
3 * Makefile.in (AR, ARFLAGS): Get values from configure.
4
12012-08-16 Paul Eggert <eggert@cs.ucla.edu> 52012-08-16 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Use ASCII tests for character types. 7 Use ASCII tests for character types.
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 2e70e0a4b6d..85a76f7a1c2 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -37,7 +37,8 @@ CFLAGS=@CFLAGS@
37CPPFLAGS=@CPPFLAGS@ 37CPPFLAGS=@CPPFLAGS@
38RANLIB=@RANLIB@ 38RANLIB=@RANLIB@
39 39
40AR = ar cq 40AR = @AR@
41ARFLAGS = @ARFLAGS@
41 42
42LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o 43LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o
43MOTIF_OBJS = lwlib-Xm.o 44MOTIF_OBJS = lwlib-Xm.o
@@ -65,7 +66,7 @@ all:: liblw.a
65 66
66liblw.a: $(OBJS) 67liblw.a: $(OBJS)
67 rm -f $@ 68 rm -f $@
68 $(AR) $@ $(OBJS) 69 $(AR) $(ARFLAGS) $@ $(OBJS)
69 $(RANLIB) $@ 70 $(RANLIB) $@
70 71
71## Generated files in ../src, non-generated in $(srcdir)/../src. 72## Generated files in ../src, non-generated in $(srcdir)/../src.
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 09859d0d630..133b18b4e3f 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,7 @@
12012-10-06 Ulrich Müller <ulm@gentoo.org>
2
3 * Makefile.in (AR, ARFLAGS): Get values from configure.
4
12012-06-26 Paul Eggert <eggert@cs.ucla.edu> 52012-06-26 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * Makefile.in (ALL_CFLAGS): Add -I../lib -I${srcdir}/../lib. 7 * Makefile.in (ALL_CFLAGS): Add -I../lib -I${srcdir}/../lib.
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 00b3d8e3c69..ee78325f0d7 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -57,8 +57,8 @@ CFLAGS=@CFLAGS@
57TAGS = etags 57TAGS = etags
58RM = rm -f 58RM = rm -f
59RANLIB = @RANLIB@ 59RANLIB = @RANLIB@
60# Solaris 2.1 ar doesn't accept the 'l' option. 60AR = @AR@
61AR = ar cq 61ARFLAGS = @ARFLAGS@
62 62
63OBJS = Activate.o \ 63OBJS = Activate.o \
64 AddPane.o \ 64 AddPane.o \
@@ -98,7 +98,7 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
98 98
99libXMenu11.a: $(OBJS) $(EXTRA) 99libXMenu11.a: $(OBJS) $(EXTRA)
100 $(RM) $@ 100 $(RM) $@
101 $(AR) $@ $(OBJS) $(EXTRA) 101 $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA)
102 $(RANLIB) $@ 102 $(RANLIB) $@
103 103
104Activate.o: Activate.c XMenuInt.h XMenu.h X10.h 104Activate.o: Activate.c XMenuInt.h XMenu.h X10.h