projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/gallium-master-merge'
[mesa.git]
/
src
/
glut
/
ggi
/
Makefile
diff --git
a/src/glut/ggi/Makefile
b/src/glut/ggi/Makefile
index 61cfceeb2593de16cdb800373cda7daeca79e815..c23dfcac105b8f601ee88c48117231c4fd2ae1e4 100644
(file)
--- a/
src/glut/ggi/Makefile
+++ b/
src/glut/ggi/Makefile
@@
-27,14
+27,14
@@
OBJECTS = $(SOURCES:.c=.o)
##### TARGETS #####
##### TARGETS #####
-default: $(LIB_DIR)/$(GLUT_LIB_NAME)
+default: $(
TOP)/$(
LIB_DIR)/$(GLUT_LIB_NAME)
# Make the library
# Make the library
-$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
- $(
TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC
)' \
+$(
TOP)/$(
LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
+ $(
MKLIB) -o $(GLUT_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS
)' \
-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
- -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+ -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(
TOP)/$(
LIB_DIR) \
$(GLUT_LIB_DEPS) $(OBJECTS)
$(GLUT_LIB_DEPS) $(OBJECTS)
@@
-46,6
+46,7
@@
clean:
depend: $(SOURCES)
depend: $(SOURCES)
+ rm -f depend
touch depend
$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES)
touch depend
$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES)