diff options
| author | Glenn Morris | 2010-05-06 00:29:09 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-06 00:29:09 -0700 |
| commit | e49dca3dd47ecfbf821196272fc2b5906a92c2d6 (patch) | |
| tree | df1e28946464ee75321c8a9e5f36331707dcb0e7 /oldXMenu | |
| parent | e3cf0cded8bed77323873044d2ad2db8d92f3621 (diff) | |
| download | emacs-e49dca3dd47ecfbf821196272fc2b5906a92c2d6.tar.gz emacs-e49dca3dd47ecfbf821196272fc2b5906a92c2d6.zip | |
Let configure handle ranlib.
* oldXMenu/Makefile.in (RANLIB): Let configure set it.
(libXMenu11.a): configure sets RANLIB = : on systems without it.
Diffstat (limited to 'oldXMenu')
| -rw-r--r-- | oldXMenu/ChangeLog | 3 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 365ff1f98a9..b17a3b2eda9 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-05-06 Glenn Morris <rgm@gnu.org> | 1 | 2010-05-06 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * Makefile.in (RANLIB): Let configure set it. | ||
| 4 | (libXMenu11.a): configure sets RANLIB = : on systems without it. | ||
| 5 | |||
| 3 | * Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE) | 6 | * Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE) |
| 4 | (STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables. | 7 | (STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables. |
| 5 | 8 | ||
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index b1d6ea5d814..5e2e2f6fb9d 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in | |||
| @@ -55,7 +55,7 @@ CC=@CC@ | |||
| 55 | CFLAGS=@CFLAGS@ | 55 | CFLAGS=@CFLAGS@ |
| 56 | TAGS = etags | 56 | TAGS = etags |
| 57 | RM = rm -f | 57 | RM = rm -f |
| 58 | RANLIB = ranlib | 58 | RANLIB = @RANLIB@ |
| 59 | # Solaris 2.1 ar doesn't accept the 'l' option. | 59 | # Solaris 2.1 ar doesn't accept the 'l' option. |
| 60 | AR = ar cq | 60 | AR = ar cq |
| 61 | 61 | ||
| @@ -97,11 +97,7 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ | |||
| 97 | libXMenu11.a: $(OBJS) $(EXTRA) | 97 | libXMenu11.a: $(OBJS) $(EXTRA) |
| 98 | $(RM) $@ | 98 | $(RM) $@ |
| 99 | $(AR) $@ $(OBJS) $(EXTRA) | 99 | $(AR) $@ $(OBJS) $(EXTRA) |
| 100 | @echo Do not be alarmed if the following ranlib command | 100 | $(RANLIB) $@ |
| 101 | @echo fails due to the absence of a ranlib program on your system. | ||
| 102 | -$(RANLIB) $@ || true | ||
| 103 | #If running ranlib fails, probably there is none. | ||
| 104 | #That's ok. So don't stop the build. | ||
| 105 | 101 | ||
| 106 | Activate.o: Activate.c XMenuInt.h XMenu.h X10.h | 102 | Activate.o: Activate.c XMenuInt.h XMenu.h X10.h |
| 107 | AddPane.o: AddPane.c XMenuInt.h XMenu.h X10.h | 103 | AddPane.o: AddPane.c XMenuInt.h XMenu.h X10.h |