Merge from emacs-23

[gnu-emacs] / oldXMenu / Makefile.in

diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 718568d556e6d6c9239321af40eb5b49ce9389a7..cf97f740af4892df951038c2778836bd02c7b491 100644 (file)
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -36,7 +36,7 @@
 
 ## To the best of our knowledge, this code was originally based on the
 ## X11 oldXMenu Makefile, which was automatically generated from the
-## X11 oldXMenu Imakefile. There was no explicit copyright information
+## X11 oldXMenu Imakefile.  There was no explicit copyright information
 ## in the Imakefile, therefore we have added the same MIT license as
 ## used by the rest of the oldXMenu code.
 
@@ -46,28 +46,20 @@
 srcdir=@srcdir@
 VPATH=@srcdir@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
+C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@
+C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@
+C_SWITCH_MACHINE=@C_SWITCH_MACHINE@
+C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@
+PROFILING_CFLAGS = @PROFILING_CFLAGS@
 
 EXTRA=insque.o
 CC=@CC@
 CFLAGS=@CFLAGS@
-CPP=@CPP@
-LN_S=@LN_S@
-             AS = as
-             LD = ld
-           TAGS = etags
-             RM = rm -f
-             MV = mv
-         RANLIB = ranlib
+TAGS = etags
+RM = rm -f
+RANLIB = @RANLIB@
 # Solaris 2.1 ar doesn't accept the 'l' option.
-             AR = ar cq
-             LS = ls
-       LINTOPTS = -axz
-    LINTLIBFLAG = -C
-           MAKE = make
-    STD_DEFINES =
-    CDEBUGFLAGS = -O
-         RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \
-                       tags TAGS make.log
+AR = ar cq
 
 OBJS =  Activate.o \
        AddPane.o \
@@ -97,7 +89,8 @@ OBJS =  Activate.o \
 all:: libXMenu11.a
 
 ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
-  $(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) $(C_SWITCH_X_MACHINE) \
+  $(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) \
+  ${C_WARNINGS_SWITCH} ${PROFILING_CFLAGS} \
   $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \
   -I../src -I${srcdir} -I${srcdir}/../src
 
@@ -107,11 +100,7 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
 libXMenu11.a: $(OBJS) $(EXTRA)
        $(RM) $@
        $(AR) $@ $(OBJS) $(EXTRA)
-       @echo Do not be alarmed if the following ranlib command
-       @echo fails due to the absence of a ranlib program on your system.
-       -$(RANLIB) $@ || true
-#If running ranlib fails, probably there is none.
-#That's ok.  So don't stop the build.
+       $(RANLIB) $@
 
 Activate.o: Activate.c XMenuInt.h XMenu.h X10.h
 AddPane.o: AddPane.c XMenuInt.h XMenu.h X10.h