Commit a00b6e690fb7be1436ac89c7ad74325c34916467
2000-01-13T15:35:02
Fixing Makefile rules.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/demos/Makefile b/demos/Makefile
index e23d9d1..30fa35f 100644
--- a/demos/Makefile
+++ b/demos/Makefile
@@ -23,7 +23,7 @@ endif
ifdef no_config_mk
exes:
- @echo Please compile the library before the demo programs !!
+ @echo Please compile the library before the demo programs!
else
@@ -50,7 +50,7 @@ endif
# cannot take a long list of arguments, we simply erase the directory
# contents..
#
-.PHONY: clean distclean
+.PHONY: clean distclean
ifdef DOSLIKE
clean_demo:
@@ -68,7 +68,7 @@ clean_demo:
distclean_demo: clean_demo
- -$(DELETE) $(BIN_)*
+ -$(DELETE) $(EXES:%=$(BIN_)%)
endif
clean: clean_demo
diff --git a/demos/graph/rules.mk b/demos/graph/rules.mk
index d397e54..0a190ed 100644
--- a/demos/graph/rules.mk
+++ b/demos/graph/rules.mk
@@ -75,7 +75,7 @@ include $(wildcard config/*/rules.mk)
# Build the "graph" library from its objects. This should be changed
# in the future in order to support more systems. Probably something
# like a `config/<system>' hierarchy with a system-specific rules file
-# to indicate how to make a library file, but for know, I'll stick to
+# to indicate how to make a library file, but for now, I'll stick to
# unix and OS/2-gcc..
#
#
@@ -92,8 +92,7 @@ $(OBJ_)%.$O: $(GRAPH_)%.c $(GRAPH_H)
# a special rule is used for 'grinit.o' as it needs the definition
# of some macros like "-DDEVICE_X11" or "-DDEVICE_OS2_PM"
#
-$(OBJ_)grinit.$O: $(GRAPH_)grinit.c
- $(CC) $(CFLAGS) $(GRAPH_INCLUDES:%=$I%) $I$(DEVICE_INCLUDES:%=$I%) $T$@ $< \
- $(DEVICES:%=$DDEVICE_%)
-
-
+$(OBJ_)grinit.$O: $(GRAPH_)grinit.c $(GRAPH_H)
+ $(CC) $(CFLAGS) $(GRAPH_INCLUDES:%=$I%) \
+ $(DEVICE_INCLUDES:%=$I%) \
+ $(DEVICES:%=$DDEVICE_%) $T$@ $<