nouveau: fix viewport clipping initialization

[mesa.git] / src / glw / Makefile

diff --git a/src/glw/Makefile b/src/glw/Makefile
index 4f1abf5d31dd1eb759331e3dd9c8bd378ed476ce..5228cbbb7219c5a07e647eece23108f5061bb50c 100644 (file)
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -7,7 +7,7 @@ MAJOR = 1
 MINOR = 0
 TINY = 0
 
-INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/X11R6/include
+INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 $(X11_INCLUDES)
 
 
 OBJECTS = $(GLW_SOURCES:.c=.o)
@@ -23,8 +23,13 @@ OBJECTS = $(GLW_SOURCES:.c=.o)
 
 ##### TARGETS #####
 
-default: $(LIB_DIR)/$(GLW_LIB_NAME)
+default: $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME)
 
+install:
+       $(INSTALL) -d $(INSTALL_DIR)/include/GL
+       $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
+       $(INSTALL) -m 644 *.h $(INSTALL_DIR)/include/GL
+       $(INSTALL) $(TOP)/$(LIB_DIR)/libGLw.* $(INSTALL_DIR)/$(LIB_DIR)
 
 clean:
        -rm depend depend.bak
@@ -32,9 +37,10 @@ clean:
 
 
 # Make the library
-$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
-       CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \
-               -patch $(TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+$(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
+       $(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' \
+               -major $(MAJOR) -minor $(MINOR) -patch $(TINY) \
+               $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
                $(GLW_LIB_DEPS) $(OBJECTS)