diff options
| author | Ulrich Mueller | 2012-10-05 20:42:28 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-10-05 20:42:28 -0400 |
| commit | 150798c5ac7953c0fd56cffd3b3720015528d820 (patch) | |
| tree | e5420302cb47e611ed491cc213fd31c9177e2f5d | |
| parent | 7fa36ccb71d0def28bc3f8eb17827fc870bd7ca2 (diff) | |
| download | emacs-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/ChangeLog | 4 | ||||
| -rw-r--r-- | lwlib/Makefile.in | 5 | ||||
| -rw-r--r-- | oldXMenu/ChangeLog | 4 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 6 |
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 @@ | |||
| 1 | 2012-10-06 Ulrich Müller <ulm@gentoo.org> | ||
| 2 | |||
| 3 | * Makefile.in (AR, ARFLAGS): Get values from configure. | ||
| 4 | |||
| 1 | 2012-08-16 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-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@ | |||
| 37 | CPPFLAGS=@CPPFLAGS@ | 37 | CPPFLAGS=@CPPFLAGS@ |
| 38 | RANLIB=@RANLIB@ | 38 | RANLIB=@RANLIB@ |
| 39 | 39 | ||
| 40 | AR = ar cq | 40 | AR = @AR@ |
| 41 | ARFLAGS = @ARFLAGS@ | ||
| 41 | 42 | ||
| 42 | LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o | 43 | LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o |
| 43 | MOTIF_OBJS = lwlib-Xm.o | 44 | MOTIF_OBJS = lwlib-Xm.o |
| @@ -65,7 +66,7 @@ all:: liblw.a | |||
| 65 | 66 | ||
| 66 | liblw.a: $(OBJS) | 67 | liblw.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 @@ | |||
| 1 | 2012-10-06 Ulrich Müller <ulm@gentoo.org> | ||
| 2 | |||
| 3 | * Makefile.in (AR, ARFLAGS): Get values from configure. | ||
| 4 | |||
| 1 | 2012-06-26 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-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@ | |||
| 57 | TAGS = etags | 57 | TAGS = etags |
| 58 | RM = rm -f | 58 | RM = rm -f |
| 59 | RANLIB = @RANLIB@ | 59 | RANLIB = @RANLIB@ |
| 60 | # Solaris 2.1 ar doesn't accept the 'l' option. | 60 | AR = @AR@ |
| 61 | AR = ar cq | 61 | ARFLAGS = @ARFLAGS@ |
| 62 | 62 | ||
| 63 | OBJS = Activate.o \ | 63 | OBJS = Activate.o \ |
| 64 | AddPane.o \ | 64 | AddPane.o \ |
| @@ -98,7 +98,7 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ | |||
| 98 | 98 | ||
| 99 | libXMenu11.a: $(OBJS) $(EXTRA) | 99 | libXMenu11.a: $(OBJS) $(EXTRA) |
| 100 | $(RM) $@ | 100 | $(RM) $@ |
| 101 | $(AR) $@ $(OBJS) $(EXTRA) | 101 | $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA) |
| 102 | $(RANLIB) $@ | 102 | $(RANLIB) $@ |
| 103 | 103 | ||
| 104 | Activate.o: Activate.c XMenuInt.h XMenu.h X10.h | 104 | Activate.o: Activate.c XMenuInt.h XMenu.h X10.h |