diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-07-13 02:50:27 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-07-13 02:50:27 +0000 |
| commit | 883f9891cb203dd087843b830ab058d6c9e160dc (patch) | |
| tree | b1aec97f592e2ee8e2bd4c25a0123cf5ab95780b /src/glut | |
| parent | d9eff8ba1943fbffb88562d84ba1fd9a56be07f0 (diff) | |
LIB_DIR is now just 'lib' or 'lib64'
Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets.
Patch by Hanno Böck.
Diffstat (limited to 'src/glut')
| -rw-r--r-- | src/glut/beos/Makefile | 10 | ||||
| -rw-r--r-- | src/glut/directfb/Makefile | 6 | ||||
| -rw-r--r-- | src/glut/ggi/Makefile | 6 | ||||
| -rw-r--r-- | src/glut/glx/Makefile | 10 | ||||
| -rw-r--r-- | src/glut/mini/Makefile | 6 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/glut/beos/Makefile b/src/glut/beos/Makefile index d9cf32565c..3ff928bfd7 100644 --- a/src/glut/beos/Makefile +++ b/src/glut/beos/Makefile @@ -75,16 +75,16 @@ INCLUDES = \ # ---- TARGETS -default: $(LIB_DIR) $(LIB_DIR)/$(GLUT_LIB_NAME) +default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) # Create the lib directory if missing -$(LIB_DIR): - mkdir $(LIB_DIR) +$(TOP)/$(LIB_DIR): + mkdir $(TOP)/$(LIB_DIR) # Make the library -$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) @$(TOP)/bin/mklib -o $(GLUT_LIB) -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ - -install $(LIB_DIR) $(MKLIB_OPTIONS) $(GLUT_LIB_DEPS) \ + -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(GLUT_LIB_DEPS) \ $(OBJECTS) clean: diff --git a/src/glut/directfb/Makefile b/src/glut/directfb/Makefile index 9e3caaa5c2..3791b16df8 100644 --- a/src/glut/directfb/Makefile +++ b/src/glut/directfb/Makefile @@ -56,14 +56,14 @@ OBJECTS = $(SOURCES:.c=.o) ##### TARGETS ##### -default: depend $(LIB_DIR)/$(GLUT_LIB_NAME) +default: depend $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library -$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ - $(GLUT_LIB_DEPS) -install $(LIB_DIR) \ + $(GLUT_LIB_DEPS) -install $(TOP)/$(LIB_DIR) \ $(MKLIB_OPTIONS) $(OBJECTS) diff --git a/src/glut/ggi/Makefile b/src/glut/ggi/Makefile index 61cfceeb25..1bef6c23a3 100644 --- a/src/glut/ggi/Makefile +++ b/src/glut/ggi/Makefile @@ -27,14 +27,14 @@ OBJECTS = $(SOURCES:.c=.o) ##### TARGETS ##### -default: $(LIB_DIR)/$(GLUT_LIB_NAME) +default: $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library -$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ -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) diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile index 534d7a7ad5..6fac92fa0c 100644 --- a/src/glut/glx/Makefile +++ b/src/glut/glx/Makefile @@ -85,22 +85,22 @@ OBJECTS = $(SOURCES:.c=.o) ##### TARGETS ##### -default: $(LIB_DIR)/$(GLUT_LIB_NAME) +default: $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library -$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ - $(MKLIB_OPTIONS) -install $(LIB_DIR) \ + $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ $(GLUT_LIB_DEPS) $(OBJECTS) install: $(INSTALL) -d $(INSTALL_DIR)/include/GL - $(INSTALL) -d $(INSTALL_DIR)/lib + $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(INSTALL_DIR)/include/GL - $(COPY_LIBS) $(LIB_DIR)/libglut* $(INSTALL_DIR)/lib + $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libglut* $(INSTALL_DIR)/$(LIB_DIR) clean: diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile index cb82384941..177bfe2d2b 100644 --- a/src/glut/mini/Makefile +++ b/src/glut/mini/Makefile @@ -50,14 +50,14 @@ OBJECTS = $(SOURCES:.c=.o) ##### TARGETS ##### -default: depend $(LIB_DIR)/$(GLUT_LIB_NAME) +default: depend $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library -$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \ -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \ - $(GLUT_LIB_DEPS) -install $(LIB_DIR) \ + $(GLUT_LIB_DEPS) -install $(TOP)/$(LIB_DIR) \ $(MKLIB_OPTIONS) $(OBJECTS) |