Merge branch 'master' into cde-next

This commit is contained in:
Jon Trulson
2018-06-28 16:55:04 -06:00
11 changed files with 60 additions and 25 deletions

View File

@@ -11,7 +11,7 @@
BOOTSTRAPCFLAGS =
CC = cc
CDEBUGFLAGS = -O
INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I../../imports/x11/include/X11
INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/X11R7/include/X11
CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
SHELL = /bin/sh
RM = rm -f
@@ -47,7 +47,7 @@ relink:
clean:
$(RM) ccimake imake.o imake
$(RM_CMD) \#*
$(RM) -r Makefile.proto Makefile Makefile.dep bootstrap
$(RM) -r Makefile.proto Makefile Makefile.dep bootstrap .depend
depend: