Merge from trunk; up to 2014-02-23T23:41:17Z!lekktu@gmail.com.

[bpt/emacs.git] / oldXMenu / Makefile.in

diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 01855f6..c1fdd82 100644 (file)
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -1,4 +1,4 @@
-## Makefile for oldXMenu
+### @configure_input@
 
 ## Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
 
@@ -15,7 +15,7 @@
 ## without express or implied warranty.
 
 
-## Copyright (C) 2001-2012 Free Software Foundation, Inc.
+## Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -43,6 +43,8 @@
 ### Code:
 
 srcdir=@srcdir@
+# MinGW CPPFLAGS may use this.
+abs_top_srcdir=@abs_top_srcdir@
 VPATH=@srcdir@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
 C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@
@@ -57,8 +59,8 @@ CFLAGS=@CFLAGS@
 TAGS = etags
 RM = rm -f
 RANLIB = @RANLIB@
-# Solaris 2.1 ar doesn't accept the 'l' option.
-AR = ar cq
+AR = @AR@
+ARFLAGS = @ARFLAGS@
 
 OBJS =  Activate.o \
        AddPane.o \
@@ -85,20 +87,21 @@ OBJS =  Activate.o \
        SetSel.o \
       XDelAssoc.o XLookAssoc.o XCrAssoc.o XDestAssoc.o XMakeAssoc.o
 
-all:: libXMenu11.a
+all: libXMenu11.a
+.PHONY: all
 
 ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
   $(C_SWITCH_X_SITE) \
   $(WARN_CFLAGS) $(WERROR_CFLAGS) ${PROFILING_CFLAGS} \
   $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \
-  -I../src -I${srcdir} -I${srcdir}/../src
+  -I../src -I../lib -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib
 
 .c.o:
        $(CC) -c ${ALL_CFLAGS} $<
 
 libXMenu11.a: $(OBJS) $(EXTRA)
        $(RM) $@
-       $(AR) $@ $(OBJS) $(EXTRA)
+       $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA)
        $(RANLIB) $@
 
 Activate.o: Activate.c XMenuInt.h XMenu.h X10.h
@@ -139,5 +142,6 @@ distclean: clean
        rm -f Makefile
 maintainer-clean: distclean
 
-tags::
+tags:
        $(TAGS) -t *.[ch]
+.PHONY: tags