These two makefiles were *horrid* abominations.

In fact they still are.  But at least now they have
some _chance_ of actually working..

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in
index df0c20af844f4da84525b5fdff56578558d369b2..a26ea9191e899d6489036228a7e52782d3994f41 100644 (file)
--- a/contrib/src/mmedia/Makefile.in
+++ b/contrib/src/mmedia/Makefile.in
@@ -3,9 +3,7 @@
 top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 
-VPATH= $(top_srcdir)/mmedia
-
-LIBTARGET=$(top_builddir)/contrib/lib/libmmedia
+LIBTARGET=libmmedia
 
 OBJECTS=cdbase.o cdwin.o g711.o g721.o g723_24.o \
   g723_40.o g72x.o sndaiff.o sndbase.o sndcodec.o \
@@ -17,5 +15,7 @@ OBJECTS=cdbase.o cdwin.o g711.o g721.o g723_24.o \
 # any VPATH assignment not containing ':'
 VPATH = :$(top_srcdir)/contrib/src/mmedia # ':' for autoconf
 
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
+
 include $(top_builddir)/src/makelib.env
 

diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in
index 6e78aa42a71785e5bed315f0aefd94e7abd7dee1..46d9f9a401e75bba27bde53eb15422a08ee8c474 100644 (file)
--- a/contrib/src/ogl/Makefile.in
+++ b/contrib/src/ogl/Makefile.in
@@ -3,9 +3,7 @@
 top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 
-VPATH= $(top_srcdir)/ogl
-
-LIBTARGET=$(top_builddir)/contrib/lib/libogl
+LIBTARGET=libogl
 
 OBJECTS=basic.o   bmpshape.o  composit.o  divided.o  lines.o    misc.o \
         basic2.o  canvas.o    constrnt.o  drawn.o    mfutils.o  ogldiag.o
@@ -15,4 +13,6 @@ OBJECTS=basic.o   bmpshape.o  composit.o  divided.o  lines.o    misc.o \
 # any VPATH assignment not containing ':'
 VPATH = :$(top_srcdir)/contrib/src/ogl # ':' for autoconf
 
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
+
 include $(top_builddir)/src/makelib.env