Fixing Makefile rules.

This commit is contained in:
Werner Lemberg 2000-01-13 15:35:02 +00:00
parent 40b4ef1ebd
commit a00b6e690f
2 changed files with 8 additions and 9 deletions

View File

@ -23,7 +23,7 @@ endif
ifdef no_config_mk ifdef no_config_mk
exes: exes:
@echo Please compile the library before the demo programs !! @echo Please compile the library before the demo programs!
else else
@ -50,7 +50,7 @@ endif
# cannot take a long list of arguments, we simply erase the directory # cannot take a long list of arguments, we simply erase the directory
# contents.. # contents..
# #
.PHONY: clean distclean .PHONY: clean distclean
ifdef DOSLIKE ifdef DOSLIKE
clean_demo: clean_demo:
@ -68,7 +68,7 @@ clean_demo:
distclean_demo: clean_demo distclean_demo: clean_demo
-$(DELETE) $(BIN_)* -$(DELETE) $(EXES:%=$(BIN_)%)
endif endif
clean: clean_demo clean: clean_demo

View File

@ -75,7 +75,7 @@ include $(wildcard config/*/rules.mk)
# Build the "graph" library from its objects. This should be changed # Build the "graph" library from its objects. This should be changed
# in the future in order to support more systems. Probably something # in the future in order to support more systems. Probably something
# like a `config/<system>' hierarchy with a system-specific rules file # 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.. # 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 # a special rule is used for 'grinit.o' as it needs the definition
# of some macros like "-DDEVICE_X11" or "-DDEVICE_OS2_PM" # of some macros like "-DDEVICE_X11" or "-DDEVICE_OS2_PM"
# #
$(OBJ_)grinit.$O: $(GRAPH_)grinit.c $(OBJ_)grinit.$O: $(GRAPH_)grinit.c $(GRAPH_H)
$(CC) $(CFLAGS) $(GRAPH_INCLUDES:%=$I%) $I$(DEVICE_INCLUDES:%=$I%) $T$@ $< \ $(CC) $(CFLAGS) $(GRAPH_INCLUDES:%=$I%) \
$(DEVICES:%=$DDEVICE_%) $(DEVICE_INCLUDES:%=$I%) \
$(DEVICES:%=$DDEVICE_%) $T$@ $<