Use `make -C' rather than `cd && make'

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

diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index f228221..7185aa6 100644 (file)
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -1,7 +1,7 @@
 ### @configure_input@
 
 # Copyright (C) 1992, 1993 Lucid, Inc.
-# Copyright (C) 1994, 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001-2014 Free Software Foundation, Inc.
 #
 # This file is part of the Lucid Widget Library.
 #
@@ -23,6 +23,8 @@
 # and set up to be configured by ../configure.
 
 srcdir=@srcdir@
+# MinGW CPPFLAGS may use this.
+abs_top_srcdir=@abs_top_srcdir@
 VPATH=@srcdir@
 @SET_MAKE@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
@@ -59,11 +61,12 @@ ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
   -Demacs -I../src \
   -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib
 
+all: liblw.a
+.PHONY: all
+
 .c.o:
        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
 
-all:: liblw.a
-
 liblw.a: $(OBJS)
        rm -f $@
        $(AR) $(ARFLAGS) $@ $(OBJS)
@@ -77,7 +80,7 @@ globals_h = ../src/globals.h
 src_h = $(config_h) $(lisp_h) $(globals_h)
 
 $(globals_h):
-       cd ../src && $(MAKE) $(MFLAGS) globals.h
+       $(MAKE) -C ../src globals.h
 
 lwlib-utils.o: $(src_h) lwlib-utils.c lwlib-utils.h lwlib.h
 lwlib.o:       $(src_h) lwlib.c lwlib.h lwlib-int.h lwlib-utils.h \
@@ -88,16 +91,27 @@ lwlib-Xm.o:    $(src_h) lwlib-Xm.c lwlib-Xm.h lwlib.h lwlib-int.h lwlib-utils.h
 xlwmenu.o:     $(src_h) xlwmenu.c xlwmenu.h lwlib.h xlwmenuP.h \
   $(srcdir)/../src/xterm.h
 
-mostlyclean:
+
+.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean
+
+clean mostlyclean:
        rm -f *.o liblw.a \#*
 
-clean: mostlyclean
 distclean: clean
        rm -f Makefile
-maintainer-clean: distclean
+
+bootstrap-clean maintainer-clean: distclean
        rm -f TAGS
 
-TAGS:
-       ../lib-src/etags $(srcdir)/*.[ch]
+
+ETAGS = ../lib-src/etags
+
+ctagsfiles= $(srcdir)/*.[ch]
+
+TAGS: $(ctagsfiles)
+       "$(ETAGS)" $(ctagsfiles)
 tags: TAGS
 .PHONY: tags
+
+
+### Makefile.in ends here