From d60389be36aae2b97889f335e0d2654ec2eb85a7 Mon Sep 17 00:00:00 2001 From: David Turner Date: Mon, 21 Feb 2000 17:46:24 +0000 Subject: [PATCH] formatting --- demos/graph/rules.mk | 3 ++- demos/graph/win32/rules.mk | 2 ++ demos/graph/x11/rules.mk | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/demos/graph/rules.mk b/demos/graph/rules.mk index 0af25f4ca..5659d42eb 100644 --- a/demos/graph/rules.mk +++ b/demos/graph/rules.mk @@ -81,7 +81,7 @@ include $(wildcard $(TOP2)/graph/*/rules.mk) # in the future in order to support more systems. Probably something # like a `config/' hierarchy with a system-specific rules file # to indicate how to make a library file, but for now, I'll stick to -# unix and OS/2-gcc.. +# unix, Win32 and OS/2-gcc.. # # $(GRAPH_LIB): $(GRAPH_OBJS) @@ -101,3 +101,4 @@ $(OBJ_)grinit.$O: $(GRAPH_)grinit.c $(GRAPH_H) $(CC) $(CFLAGS) $(GRAPH_INCLUDES:%=$I%) \ $(DEVICE_INCLUDES:%=$I%) \ $(DEVICES:%=$DDEVICE_%) $T$@ $< + diff --git a/demos/graph/win32/rules.mk b/demos/graph/win32/rules.mk index 20c202443..0bccf839c 100644 --- a/demos/graph/win32/rules.mk +++ b/demos/graph/win32/rules.mk @@ -7,6 +7,8 @@ ifeq ($(PLATFORM),win32) +# directory of the Win32 graphics driver +# GR_WIN32 := $(GRAPH_)win32 GR_WIN32_ := $(GR_WIN32)$(SEP) diff --git a/demos/graph/x11/rules.mk b/demos/graph/x11/rules.mk index a6e185f84..ada27c77c 100644 --- a/demos/graph/x11/rules.mk +++ b/demos/graph/x11/rules.mk @@ -37,7 +37,7 @@ endif # Update some variables to compile the X11 graphics module. Note that # X11 is available on Unix, or on OS/2. However, it only compiles with # gcc on the latter platform, which is why it is safe to use the flags -# `-L' and `-l' +# `-L' and `-l' in GRAPH_LINK # ifneq ($(X11_PATH),) @@ -47,7 +47,7 @@ X11_LIB := $(X11_PATH:%=%$(SEP)lib) # the GRAPH_LINK variable is expanded each time an executable is linked against # the graphics library.. # -GRAPH_LINK += $(X11_LIB:%=-L%) -lX11 +GRAPH_LINK += -L$(X11_LIB) -lX11 # Solaris needs a -lsocket in GRAPH_LINK .. #