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 9a0a504f73a1361b392fc81316b21a4e773b4924..90066b4662d8f1c99a340b9f642bb4007dd0ba39 100644 (file)
--- 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 d6bcd8165b2cb1133fbd882774836c1db46baa00..396326345658df2059597d301115ecc76699da1f 100644 (file)
--- 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 01d9e4a0b3053fdc6ef1901f615bf7d6a181a3b1..9e3600c23916e115b7efd4608406768b14ba5699 100644 (file)
--- 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 6659db45704bb67316ed34e989edadb078d73718..c0fddc5f3300e6651c8300b4c019d83352a18b45 100644 (file)
--- 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 8790b7b0a46ad2b92d5e567708a9808abd7fe419..4d6b13097f8e5a17d13039b0eb67fda28da61223 100644 (file)
--- 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 bd331b76423e2ab5087cb28ec0a672d8f9d75032..c1998f67fdb9db64b8169bf8aa46db4e6bdfd326 100644 (file)
--- 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 f6484ad3e98ba2022821cbe8fa0d5eb24c71ffe6..e43914139d0cfe64f9c03288675a94979584d327 100644 (file)
--- 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 45e081e2bd4ee53b9503faf49c42b29ac1d858f5..1c01f3a3b842e26e62f300e8f56d85b0c0e12612 100644 (file)
--- 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 76655016220ff2a9c9049137a653255b4c8b6dd1..70896d9437dc3c5906fea1b8f922a486b6551432 100644 (file)
--- 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 98340af6b7d368c769406750d3b2a18e5d749b55..f24b64c46b4ec78982f0bbb84dac12ab2a8b6e5b 100644 (file)
--- 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 d10e084feb7dc2f36a91c696a80aee752ba299a2..4c4acdd25a8afd14244c6af91ab87770d5d103b2 100644 (file)
--- 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 c5a15a901a20b466457a42cf3176d2a690224942..2d81539c7140f1a4efe683c451cccc89754ad092 100644 (file)
--- 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 846ed25624d6f8ccddb76ca3e56e96cc2422d0cc..0b5356ac428cf02214ba6a737de10abb92ed819d 100644 (file)
--- 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 2f8dfed228d263d66acfb06f6252d93eb298938b..94177e6b17de4c1e122398a7ac0bb97b005dc107 100644 (file)
--- 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 3bcd65b8b0f5e7cfe4251010094d3b0c176559c4..27bc9657d998a58203f905693c5322165b7b05cc 100644 (file)
--- 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 7c96e529c53d4446d3b2d8611a6044d8fc51ecc1..12a93aeac70f1a637581ba5ff4bc2cb9d805bebf 100644 (file)
--- 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 0256bf119f5169041b09abee586ff9e29a417421..264aaaac4c76c5656b7eb867bb934f5f2353300e 100644 (file)
--- 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 af2d0405e5836dcc6eda853ff85e4ea9d7e3ce0a..7c2cf13701cce741e5e2850202df81a2147de925 100644 (file)
--- 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