From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 7 May 2001 14:37:53 +0000 (+0000)
Subject: Some makefile corrections
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/779cedff87b868bc68df74321913a720bc4e2df7

Some makefile corrections


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

diff --git a/contrib/samples/ogl/ogledit/makefile.b32 b/contrib/samples/ogl/ogledit/makefile.b32
index 9a0a504f73..90066b4662 100644
--- a/contrib/samples/ogl/ogledit/makefile.b32
+++ b/contrib/samples/ogl/ogledit/makefile.b32
@@ -10,8 +10,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=ogledit
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
-# EXTRACPPFLAGS=-I$(WXDIR)\utils\ogl\src
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
 OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
 
 !include $(WXDIR)\src\makeprog.b32
diff --git a/contrib/samples/ogl/ogledit/makefile.bcc b/contrib/samples/ogl/ogledit/makefile.bcc
index d6bcd8165b..3963263456 100644
--- a/contrib/samples/ogl/ogledit/makefile.bcc
+++ b/contrib/samples/ogl/ogledit/makefile.bcc
@@ -13,8 +13,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=ogledit
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
-# EXTRACPPFLAGS=-I$(WXDIR)\utils\ogl\src
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
 OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
 
 !include $(WXDIR)\src\makeprog.b32
diff --git a/contrib/samples/ogl/ogledit/makefile.dos b/contrib/samples/ogl/ogledit/makefile.dos
index 01d9e4a0b3..9e3600c239 100644
--- a/contrib/samples/ogl/ogledit/makefile.dos
+++ b/contrib/samples/ogl/ogledit/makefile.dos
@@ -16,8 +16,8 @@ WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makemsc.env
 
 THISDIR = $(WXDIR)\contrib\samples\ogl\ogledit
-WXLIB = $(WXDIR)\contrib\lib\wx.lib
-OGLLIB = $(WXDIR)\contrib\lib\ogl.lib
+WXLIB = $(WXDIR)\lib\wx.lib
+OGLLIB = $(WXDIR)\lib\ogl.lib
 
 LIBS=$(WXLIB) $(OGLLIB) oldnames libw llibcew commdlg shell ddeml
 
diff --git a/contrib/samples/ogl/ogledit/makefile.vc b/contrib/samples/ogl/ogledit/makefile.vc
index 6659db4570..c0fddc5f33 100644
--- a/contrib/samples/ogl/ogledit/makefile.vc
+++ b/contrib/samples/ogl/ogledit/makefile.vc
@@ -18,9 +18,9 @@ PROGRAM=ogledit
 FINAL=0
 
 !if "$(FINAL)" == "0"
-EXTRALIBS=$(WXDIR)\contrib\lib\ogld.lib
+EXTRALIBS=$(WXDIR)\lib\ogld.lib
 !else
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
 !endif
 
 OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj
diff --git a/contrib/samples/ogl/ogledit/makefile.wat b/contrib/samples/ogl/ogledit/makefile.wat
index 8790b7b0a4..4d6b13097f 100644
--- a/contrib/samples/ogl/ogledit/makefile.wat
+++ b/contrib/samples/ogl/ogledit/makefile.wat
@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = ogledit
-EXTRALIBS = $(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS = $(WXDIR)\lib\ogl.lib
 OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj
 
 !include $(WXDIR)\src\makeprog.wat
diff --git a/contrib/samples/ogl/studio/makefile.b32 b/contrib/samples/ogl/studio/makefile.b32
index bd331b7642..c1998f67fd 100644
--- a/contrib/samples/ogl/studio/makefile.b32
+++ b/contrib/samples/ogl/studio/makefile.b32
@@ -10,7 +10,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=studio
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
 OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\
   mainfrm.obj project.obj dialogs.obj csprint.obj
 
diff --git a/contrib/samples/ogl/studio/makefile.bcc b/contrib/samples/ogl/studio/makefile.bcc
index f6484ad3e9..e43914139d 100644
--- a/contrib/samples/ogl/studio/makefile.bcc
+++ b/contrib/samples/ogl/studio/makefile.bcc
@@ -13,7 +13,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=studio
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
 OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\
   mainfrm.obj project.obj dialogs.obj csprint.obj
 
diff --git a/contrib/samples/ogl/studio/makefile.vc b/contrib/samples/ogl/studio/makefile.vc
index 45e081e2bd..1c01f3a3b8 100644
--- a/contrib/samples/ogl/studio/makefile.vc
+++ b/contrib/samples/ogl/studio/makefile.vc
@@ -18,9 +18,9 @@ PROGRAM=studio
 FINAL=0
 
 !if "$(FINAL)" == "0"
-EXTRALIBS=$(WXDIR)\contrib\lib\ogld.lib
+EXTRALIBS=$(WXDIR)\lib\ogld.lib
 !else
-EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
 !endif
 
 OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\
diff --git a/contrib/samples/ogl/studio/makefile.wat b/contrib/samples/ogl/studio/makefile.wat
index 7665501622..70896d9437 100644
--- a/contrib/samples/ogl/studio/makefile.wat
+++ b/contrib/samples/ogl/studio/makefile.wat
@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = studio
-EXTRALIBS = $(WXDIR)\contrib\lib\ogl.lib
+EXTRALIBS = $(WXDIR)\lib\ogl.lib
 OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj &
   mainfrm.obj project.obj dialogs.obj csprint.obj
 
diff --git a/contrib/samples/xml/makefile.b32 b/contrib/samples/xml/makefile.b32
index 98340af6b7..f24b64c46b 100644
--- a/contrib/samples/xml/makefile.b32
+++ b/contrib/samples/xml/makefile.b32
@@ -11,7 +11,7 @@ WXDIR = $(WXWIN)
 
 TARGET=xmldemo
 
-EXTRALIBS=$(WXDIR)\contrib\lib\wxxml.lib
+EXTRALIBS=$(WXDIR)\lib\wxxml.lib
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.b32
diff --git a/contrib/samples/xml/makefile.vc b/contrib/samples/xml/makefile.vc
index d10e084feb..4c4acdd25a 100644
--- a/contrib/samples/xml/makefile.vc
+++ b/contrib/samples/xml/makefile.vc
@@ -7,7 +7,7 @@ WXDIR = $(WXWIN)
 PROGRAM = xmldemo
 
 OBJECTS = $(PROGRAM).obj
-EXTRALIBS = $(WXDIR)\contrib\lib\wxxml$(LIBEXT).lib
+EXTRALIBS = $(WXDIR)\lib\wxxml$(LIBEXT).lib
 EXTRAINC = -I$(WXDIR)\contrib\include
 
 !include $(WXDIR)\src\makeprog.vc
diff --git a/contrib/src/ogl/OglVC.dsp b/contrib/src/ogl/OglVC.dsp
index c5a15a901a..2d81539c71 100644
--- a/contrib/src/ogl/OglVC.dsp
+++ b/contrib/src/ogl/OglVC.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\ogl.lib"
+# ADD LIB32 /nologo /out:"..\..\..\lib\ogl.lib"
 
 !ELSEIF  "$(CFG)" == "OglVC - Win32 Debug"
 
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\ogld.lib"
+# ADD LIB32 /nologo /out:"..\..\..\lib\ogld.lib"
 
 !ENDIF 
 
diff --git a/contrib/src/ogl/makefile.b32 b/contrib/src/ogl/makefile.b32
index 846ed25624..0b5356ac42 100644
--- a/contrib/src/ogl/makefile.b32
+++ b/contrib/src/ogl/makefile.b32
@@ -9,7 +9,7 @@
 
 WXDIR = $(WXWIN)
 
-LIBTARGET=$(WXDIR)\contrib\lib\ogl.lib
+LIBTARGET=$(WXDIR)\lib\ogl.lib
 
 OBJECTS = basic.obj basic2.obj canvas.obj ogldiag.obj lines.obj misc.obj divided.obj constrnt.obj\
  composit.obj drawn.obj bmpshape.obj mfutils.obj
diff --git a/contrib/src/ogl/makefile.bcc b/contrib/src/ogl/makefile.bcc
index 2f8dfed228..94177e6b17 100644
--- a/contrib/src/ogl/makefile.bcc
+++ b/contrib/src/ogl/makefile.bcc
@@ -12,7 +12,7 @@
 
 WXDIR = $(WXWIN)
 
-LIBTARGET=$(WXDIR)\contrib\lib\ogl.lib
+LIBTARGET=$(WXDIR)\lib\ogl.lib
 
 OBJECTS = basic.obj basic2.obj canvas.obj ogldiag.obj lines.obj misc.obj divided.obj constrnt.obj\
  composit.obj drawn.obj bmpshape.obj mfutils.obj
diff --git a/contrib/src/ogl/makefile.dos b/contrib/src/ogl/makefile.dos
index 3bcd65b8b0..27bc9657d9 100644
--- a/contrib/src/ogl/makefile.dos
+++ b/contrib/src/ogl/makefile.dos
@@ -20,7 +20,7 @@ OGLDIR = $(WXDIR)\contrib\src\ogl
 THISDIR = $(OGLDIR)
 DOCDIR = $(WXDIR)\contrib\docs\latex\ogl
 
-GRAPHICSLIB = $(WXDIR)\contrib\lib\ogl.lib
+GRAPHICSLIB = $(WXDIR)\lib\ogl.lib
 INC = /I$(WXDIR)\include /I$(WXDIR)\contrib\include
 
 # Normally set OPTIONS =
diff --git a/contrib/src/ogl/makefile.g95 b/contrib/src/ogl/makefile.g95
index 7c96e529c5..12a93aeac7 100644
--- a/contrib/src/ogl/makefile.g95
+++ b/contrib/src/ogl/makefile.g95
@@ -9,7 +9,7 @@
 
 WXDIR = ../../..
 
-LIBTARGET=$(WXDIR)/contrib/lib/libogl.a
+LIBTARGET=$(WXDIR)/lib/libogl.a
 OBJECTS = basic.o basic2.o canvas.o ogldiag.o lines.o misc.o divided.o constrnt.o\
  composit.o drawn.o bmpshape.o mfutils.o
 
diff --git a/contrib/src/ogl/makefile.vc b/contrib/src/ogl/makefile.vc
index 0256bf119f..264aaaac4c 100644
--- a/contrib/src/ogl/makefile.vc
+++ b/contrib/src/ogl/makefile.vc
@@ -28,7 +28,7 @@ PROGRAM=test
 OBJECTS = $(D)\basic.obj $(D)\basic2.obj $(D)\canvas.obj $(D)\ogldiag.obj $(D)\lines.obj $(D)\misc.obj $(D)\divided.obj $(D)\constrnt.obj\
  $(D)\composit.obj $(D)\drawn.obj $(D)\bmpshape.obj $(D)\mfutils.obj
 
-LIBTARGET=$(WXDIR)\contrib\lib\ogl$(LIBEXT).lib
+LIBTARGET=$(WXDIR)\lib\ogl$(LIBEXT).lib
 
 all:    $(D) $(LIBTARGET)
 
diff --git a/contrib/src/ogl/makefile.wat b/contrib/src/ogl/makefile.wat
index af2d0405e5..7c2cf13701 100644
--- a/contrib/src/ogl/makefile.wat
+++ b/contrib/src/ogl/makefile.wat
@@ -6,7 +6,7 @@ WXDIR = ..\..\..
 
 EXTRACPPFLAGS=/DPROLOGIO
 
-OGLLIB = $(WXDIR)\contrib\lib\ogl.lib
+OGLLIB = $(WXDIR)\lib\ogl.lib
 THISDIR = $(WXDIR)\src\ogl
 
 NAME = ogl