[Wxdevcenter-cvs] wxDevCenter wxDevCenter.bkl,1.11,1.11.2.1 GNUmakefile,1.11,1.11.2.1 wx.bkl,1.4,NONE

[Emilien K. <cur...@us...>]

Update of /cvsroot/wxdevcenter/wxDevCenter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8401

Modified Files:
      Tag: modularisation
	wxDevCenter.bkl GNUmakefile 
Removed Files:
      Tag: modularisation
	wx.bkl 
Log Message:
Modularize bakefiles.
Begining of Module class.

--- wx.bkl DELETED ---

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** GNUmakefile	14 Sep 2005 14:19:11 -0000	1.11
--- GNUmakefile	21 Sep 2005 15:00:38 -0000	1.11.2.1
***************
*** 17,26 ****
  prefix = /usr/local
  
- #  
- AR = ar
- 
- #  
- RANLIB = ranlib
- 
  # C++ compiler 
  CXX = g++
--- 17,20 ----
***************
*** 50,53 ****
--- 44,50 ----
  WXPORTNAME = gtk2
  
+ # Version of installed wxDockIt. [21]
+ WXDOCKIT = 21
+ 
  
  
***************
*** 59,73 ****
  
  CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
- SPECIFIC_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) $(__UNICODE_DEFINE_p) \
- 	$(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) $(__WXUSINGDLL_p) \
- 	`wx-config --cppflags` -Iinclude -DwxDC_INSTALL_TARGET=\"$(prefix)\" \
- 	$(CPPFLAGS) $(CXXFLAGS)
- SPECIFIC_OBJECTS =  \
- 	./build/$(BUILD)/specific_Config.o \
- 	./build/$(BUILD)/specific_FileSystemStandard.o
  WXDEVCENTERLIB_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \
  	$(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \
! 	$(__WXUSINGDLL_p) `wx-config --cppflags` -Iinclude -fPIC -DPIC $(CPPFLAGS) \
! 	$(CXXFLAGS)
  WXDEVCENTERLIB_OBJECTS =  \
  	./build/$(BUILD)/wxDevCenterLib_AboutBox.o \
--- 56,63 ----
  
  CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
  WXDEVCENTERLIB_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \
  	$(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \
! 	$(__WXUSINGDLL_p) `wx-config --cppflags` -Iinclude \
! 	-DwxDC_INSTALL_TARGET=\"$(prefix)\" -fPIC -DPIC $(CPPFLAGS) $(CXXFLAGS)
  WXDEVCENTERLIB_OBJECTS =  \
  	./build/$(BUILD)/wxDevCenterLib_AboutBox.o \
***************
*** 76,79 ****
--- 66,70 ----
  	./build/$(BUILD)/wxDevCenterLib_Command.o \
  	./build/$(BUILD)/wxDevCenterLib_Config.o \
+ 	./build/$(BUILD)/wxDevCenterLib_Config_unix.o \
  	./build/$(BUILD)/wxDevCenterLib_DocManager.o \
  	./build/$(BUILD)/wxDevCenterLib_DocType.o \
***************
*** 88,95 ****
  	./build/$(BUILD)/wxDevCenterLib_Frame.o \
  	./build/$(BUILD)/wxDevCenterLib_Layout.o \
- 	./build/$(BUILD)/wxDevCenterLib_MainFrame.o \
  	./build/$(BUILD)/wxDevCenterLib_Manager.o \
- 	./build/$(BUILD)/wxDevCenterLib_MDIFrame.o \
  	./build/$(BUILD)/wxDevCenterLib_MiniView.o \
  	./build/$(BUILD)/wxDevCenterLib_Plugin.o \
  	./build/$(BUILD)/wxDevCenterLib_Project.o \
--- 79,85 ----
  	./build/$(BUILD)/wxDevCenterLib_Frame.o \
  	./build/$(BUILD)/wxDevCenterLib_Layout.o \
  	./build/$(BUILD)/wxDevCenterLib_Manager.o \
  	./build/$(BUILD)/wxDevCenterLib_MiniView.o \
+ 	./build/$(BUILD)/wxDevCenterLib_Module.o \
  	./build/$(BUILD)/wxDevCenterLib_Plugin.o \
  	./build/$(BUILD)/wxDevCenterLib_Project.o \
***************
*** 102,105 ****
--- 92,103 ----
  WXDEVCENTER_OBJECTS =  \
  	./build/$(BUILD)/wxDevCenter_AppImpl.o
+ WXDC_UNIX_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \
+ 	$(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \
+ 	$(__WXUSINGDLL_p) `wx-config --cppflags` -Iinclude -fPIC -DPIC $(CPPFLAGS) \
+ 	$(CXXFLAGS)
+ WXDC_UNIX_OBJECTS =  \
+ 	./build/$(BUILD)/wxdc_unix_FileSystemStandard.o \
+ 	./build/$(BUILD)/wxdc_unix_MainFrame.o \
+ 	./build/$(BUILD)/wxdc_unix_MDIFrame.o
  
  ### Conditionally set variables: ###
***************
*** 129,132 ****
--- 127,133 ----
  WXVERSIONTAG = 2.6
  endif
+ ifeq ($(WXDOCKIT),21)
+ WXDOCKIT_VERSION = 2.1
+ endif
  ifeq ($(BUILD),debug)
  FREEDESKTOP_MENU_FILE = wxdevcenterd.desktop
***************
*** 170,178 ****
  ### Targets: ###
  
! all: ./lib/libspecific.a lib/libwxDevCenterLib.so ./bin/wxDevCenter$(SUFFIX)
  
! install: all install_wxDevCenterLib install_wxDevCenter
  	$(INSTALL) -d $(prefix)/include
! 	for f in wxDevCenter.h wxDevCenterPlugin.h wxDevCenter/AboutBox.h wxDevCenter/Application.h wxDevCenter/ArtProvider.h wxDevCenter/Command.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileSystemStandard.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/Layout.h wxDevCenter/MainFrame.h wxDevCenter/Manager.h wxDevCenter/MDIFrame.h wxDevCenter/Plugin.h wxDevCenter/Project.h wxDevCenter/setup.h wxDevCenter/StatusBar.h wxDevCenter/WorkBar.h wxDevCenter/unix/Config.h wxDevCenter/unix/FileSystemStandard.h; do \
  	if test ! -d $(prefix)/include/`dirname $$f` ; then \
  	$(INSTALL) -d $(prefix)/include/`dirname $$f`; \
--- 171,179 ----
  ### Targets: ###
  
! all: lib/libwxDevCenterLib.so ./bin/wxDevCenter$(SUFFIX) ./modules/wxdc-unix.so
  
! install: all install_wxDevCenterLib install_wxDevCenter install_wxdc-unix
  	$(INSTALL) -d $(prefix)/include
! 	for f in wxDevCenter.h wxDevCenterPlugin.h wxDevCenter/AboutBox.h wxDevCenter/Application.h wxDevCenter/ArtProvider.h wxDevCenter/Command.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/Layout.h wxDevCenter/Manager.h wxDevCenter/Module.h wxDevCenter/Plugin.h wxDevCenter/Project.h wxDevCenter/setup.h wxDevCenter/StatusBar.h wxDevCenter/WorkBar.h wxDevCenter/unix/Config.h wxDevCenter/unix/FileSystemStandard.h; do \
  	if test ! -d $(prefix)/include/`dirname $$f` ; then \
  	$(INSTALL) -d $(prefix)/include/`dirname $$f`; \
***************
*** 197,212 ****
  	rm -f ./build/$(BUILD)/*.o
  	rm -f ./build/$(BUILD)/*.d
- 	rm -f ./lib/libspecific.a
  	rm -f lib/libwxDevCenterLib.so
  	rm -f lib/libwxDevCenterLib.so
  	rm -f ./bin/wxDevCenter$(SUFFIX)
  
! ./lib/libspecific.a: $(SPECIFIC_OBJECTS)
! 	rm -f $@
! 	$(AR) rcu $@ $(SPECIFIC_OBJECTS)
! 	$(RANLIB) $@
! 
! lib/libwxDevCenterLib.so: $(WXDEVCENTERLIB_OBJECTS) ./lib/libspecific.a ./lib/libspecific.a
! 	$(CXX) -shared -fPIC -o $@ $(WXDEVCENTERLIB_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs`  -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) ./lib/libspecific.a -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_fl-$(WXVERSIONTAG) -lwxdockit-2.1
  
  install_wxDevCenterLib: 
--- 198,208 ----
  	rm -f ./build/$(BUILD)/*.o
  	rm -f ./build/$(BUILD)/*.d
  	rm -f lib/libwxDevCenterLib.so
  	rm -f lib/libwxDevCenterLib.so
  	rm -f ./bin/wxDevCenter$(SUFFIX)
+ 	rm -f ./modules/wxdc-unix.so
  
! lib/libwxDevCenterLib.so: $(WXDEVCENTERLIB_OBJECTS)
! 	$(CXX) -shared -fPIC -o $@ $(WXDEVCENTERLIB_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs`  -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG)
  
  install_wxDevCenterLib: 
***************
*** 216,220 ****
  
  ./bin/wxDevCenter$(SUFFIX): $(WXDEVCENTER_OBJECTS) lib/libwxDevCenterLib.so
! 	$(CXX) -o $@ $(WXDEVCENTER_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs`  -L./lib  -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwxDevCenterLib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG)
  
  install_wxDevCenter: 
--- 212,216 ----
  
  ./bin/wxDevCenter$(SUFFIX): $(WXDEVCENTER_OBJECTS) lib/libwxDevCenterLib.so
! 	$(CXX) -o $@ $(WXDEVCENTER_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs`  -L./lib  -lwxDevCenterLib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG)
  
  install_wxDevCenter: 
***************
*** 222,230 ****
  	install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin
  
! ./build/$(BUILD)/specific_Config.o: ./src/unix/Config.cpp
! 	$(CXX) -c -o $@ $(SPECIFIC_CXXFLAGS) $(CPPDEPS) $<
  
! ./build/$(BUILD)/specific_FileSystemStandard.o: ./src/unix/FileSystemStandard.cpp
! 	$(CXX) -c -o $@ $(SPECIFIC_CXXFLAGS) $(CPPDEPS) $<
  
  ./build/$(BUILD)/wxDevCenterLib_AboutBox.o: ./src/AboutBox.cpp
--- 218,227 ----
  	install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin
  
! ./modules/wxdc-unix.so: $(WXDC_UNIX_OBJECTS)
! 	$(CXX) -shared -fPIC -o $@ $(WXDC_UNIX_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs`  -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxdockit-$(WXDOCKIT_VERSION)
  
! install_wxdc-unix: 
! 	$(INSTALL) -d $(prefix)/lib/wxDevCenter/modules
! 	install -c ./modules/wxdc-unix.so $(prefix)/lib/wxDevCenter/modules
  
  ./build/$(BUILD)/wxDevCenterLib_AboutBox.o: ./src/AboutBox.cpp
***************
*** 243,246 ****
--- 240,246 ----
  	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
  
+ ./build/$(BUILD)/wxDevCenterLib_Config_unix.o: ./src/unix/Config-unix.cpp
+ 	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
+ 
  ./build/$(BUILD)/wxDevCenterLib_DocManager.o: ./src/DocManager.cpp
  	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
***************
*** 279,292 ****
  	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
  
- ./build/$(BUILD)/wxDevCenterLib_MainFrame.o: ./src/MainFrame.cpp
- 	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
- 
  ./build/$(BUILD)/wxDevCenterLib_Manager.o: ./src/Manager.cpp
  	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
  
! ./build/$(BUILD)/wxDevCenterLib_MDIFrame.o: ./src/MDIFrame.cpp
  	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
  
! ./build/$(BUILD)/wxDevCenterLib_MiniView.o: ./src/MiniView.cpp
  	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
  
--- 279,289 ----
  	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
  
  ./build/$(BUILD)/wxDevCenterLib_Manager.o: ./src/Manager.cpp
  	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
  
! ./build/$(BUILD)/wxDevCenterLib_MiniView.o: ./src/MiniView.cpp
  	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
  
! ./build/$(BUILD)/wxDevCenterLib_Module.o: ./src/Module.cpp
  	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
  
***************
*** 309,313 ****
  	$(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $<
  
! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter
  
  
--- 306,319 ----
  	$(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $<
  
! ./build/$(BUILD)/wxdc_unix_FileSystemStandard.o: ./src/unix/FileSystemStandard.cpp
! 	$(CXX) -c -o $@ $(WXDC_UNIX_CXXFLAGS) $(CPPDEPS) $<
! 
! ./build/$(BUILD)/wxdc_unix_MainFrame.o: ./src/MainFrame.cpp
! 	$(CXX) -c -o $@ $(WXDC_UNIX_CXXFLAGS) $(CPPDEPS) $<
! 
! ./build/$(BUILD)/wxdc_unix_MDIFrame.o: ./src/MDIFrame.cpp
! 	$(CXX) -c -o $@ $(WXDC_UNIX_CXXFLAGS) $(CPPDEPS) $<
! 
! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter install_wxdc-unix
  
  

Index: wxDevCenter.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** wxDevCenter.bkl	24 Apr 2005 16:10:56 -0000	1.11
--- wxDevCenter.bkl	21 Sep 2005 15:00:38 -0000	1.11.2.1
***************
*** 2,10 ****
  <makefile>
  
!     <include file="build/wx.bkl" /> 
  
!     <include file="build/wxDevCenter.bkl" /> 
  
!     <include file="build/install.bkl" /> 
  
  </makefile>
--- 2,21 ----
  <makefile>
  
! 	<!-- Default wxWidgets template definition. -->
!     <include file="build/bakefiles/wx.bkl" /> 
  
! 	<!-- wxDevCenter rule definition. -->
!     <include file="build/bakefiles/wxDevCenter.bkl" /> 
  
! 	<!-- Standard modules. -->
! 	<if cond="PLATFORM_WIN32=='1'">
! 		<include file="build/bakefiles/wxDevCenter-msw.bkl" />
! 	</if>
! 	<if cond="PLATFORM_UNIX=='1'">
! 		<include file="build/bakefiles/wxDevCenter-unix.bkl" />
! 	</if>
! 
! 	<!-- Installation rules. -->
!     <include file="build/bakefiles/install.bkl" /> 
  
  </makefile>