projects / packages / Mesa.git / blame
| Commit | Line | Data |
|---|---|---|
| ba5bbbdb AM |
1 | diff -urN Mesa-4.0.1.org/si-glu/libnurbs/interface/Makefile.am Mesa-4.0.1/si-glu/libnurbs/interface/Makefile.am |
| 2 | --- Mesa-4.0.1.org/si-glu/libnurbs/interface/Makefile.am Thu Jan 3 17:34:03 2002 | |
| 3 | +++ Mesa-4.0.1/si-glu/libnurbs/interface/Makefile.am Thu Jan 3 17:37:22 2002 | |
| 4 | @@ -8,7 +8,7 @@ | |
| e1833810 | 5 | |
| ba5bbbdb AM |
6 | # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging |
| 7 | # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details. | |
| dda8ea51 | 8 | -CXXFLAGS += -DLIBRARYBUILD -DNDEBUG |
| 9 | +CXXFLAGS = @CXXFLAGS@ -DLIBRARYBUILD -DNDEBUG | |
| e1833810 | 10 | |
| ba5bbbdb AM |
11 | include libNIFac_la_SOURCES |
| 12 | ||
| 13 | diff -urN Mesa-4.0.1.org/si-glu/libnurbs/internals/Makefile.am Mesa-4.0.1/si-glu/libnurbs/internals/Makefile.am | |
| 14 | --- Mesa-4.0.1.org/si-glu/libnurbs/internals/Makefile.am Thu Jan 3 17:34:04 2002 | |
| 15 | +++ Mesa-4.0.1/si-glu/libnurbs/internals/Makefile.am Thu Jan 3 17:37:40 2002 | |
| 16 | @@ -8,7 +8,7 @@ | |
| 17 | ||
| 18 | # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging | |
| 19 | # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details. | |
| dda8ea51 | 20 | -CXXFLAGS += -DLIBRARYBUILD -DNDEBUG |
| 21 | +CXXFLAGS = @CXXFLAGS@ -DLIBRARYBUILD -DNDEBUG | |
| ba5bbbdb AM |
22 | |
| 23 | include libNInt_la_SOURCES | |
| 24 | ||
| 25 | diff -urN Mesa-4.0.1.org/si-glu/libnurbs/nurbtess/Makefile.am Mesa-4.0.1/si-glu/libnurbs/nurbtess/Makefile.am | |
| 26 | --- Mesa-4.0.1.org/si-glu/libnurbs/nurbtess/Makefile.am Thu Jan 3 17:34:04 2002 | |
| 27 | +++ Mesa-4.0.1/si-glu/libnurbs/nurbtess/Makefile.am Thu Jan 3 17:37:54 2002 | |
| 28 | @@ -8,7 +8,7 @@ | |
| 29 | ||
| 30 | # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging | |
| 31 | # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details. | |
| dda8ea51 | 32 | -CFLAGS += -DLIBRARYBUILD -DNDEBUG |
| 33 | +CFLAGS = @CXXFLAGS@ -DLIBRARYBUILD -DNDEBUG | |
| ba5bbbdb AM |
34 | |
| 35 | include libNTess_la_SOURCES | |
| 36 | ||
| 37 | diff -urN Mesa-4.0.1.org/src-glut/Makefile.am Mesa-4.0.1/src-glut/Makefile.am | |
| 38 | --- Mesa-4.0.1.org/src-glut/Makefile.am Wed Aug 29 05:01:27 2001 | |
| 39 | +++ Mesa-4.0.1/src-glut/Makefile.am Thu Jan 3 17:38:46 2002 | |
| 40 | @@ -9,7 +9,6 @@ | |
| 41 | EXTRA_PROGRAMS = capturexfont | |
| 42 | ||
| 43 | libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@ | |
| 44 | -libglut_la_LIBADD = -lGLU | |
| 45 | libglut_la_SOURCES = \ | |
| 46 | glutwin32.h \ | |
| 47 | win32_glx.h \ | |
| 48 | @@ -67,7 +66,7 @@ | |
| 49 | layerutil.h \ | |
| 50 | stroke.h | |
| 51 | ||
| 52 | -libglut_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD) | |
| 53 | +libglut_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD) -lGLU | |
| 54 | capturexfont_LDFLAGS = $(X_LIBS) $(X_PRE_LIBS) $(X_LIBADD) | |
| 55 | ||
| 56 | EXTRA_DIST = descript.mms |