Menu
▾
▴
[Wxdevcenter-cvs] wxDevCenter wxDevCenter.bkl,1.11.2.1,1.11.2.2 GNUmakefile,1.11.2.2,1.11.2.3
|
From: Emilien K. <cur...@us...> - 2005-09-24 12:45:57
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3761 Modified Files: Tag: modularisation wxDevCenter.bkl GNUmakefile Log Message: Return to a monobloc structure. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -C2 -d -r1.11.2.2 -r1.11.2.3 *** GNUmakefile 24 Sep 2005 11:44:21 -0000 1.11.2.2 --- GNUmakefile 24 Sep 2005 12:45:44 -0000 1.11.2.3 *************** *** 76,83 **** --- 76,86 ---- ./build/$(BUILD)/wxDevCenterLib_FileSystemTreeCtrl.o \ ./build/$(BUILD)/wxDevCenterLib_FileSystemStandard.o \ + ./build/$(BUILD)/wxDevCenterLib_FileSystemStandard_unix.o \ ./build/$(BUILD)/wxDevCenterLib_FileTools.o \ ./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_Module.o \ *************** *** 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: ### --- 95,98 ---- *************** *** 171,177 **** ### 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 \ --- 166,172 ---- ### Targets: ### ! all: 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/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 \ *************** *** 201,208 **** 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: --- 196,202 ---- rm -f lib/libwxDevCenterLib.so rm -f ./bin/wxDevCenter$(SUFFIX) 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) -lwxdockit-$(WXDOCKIT_VERSION) install_wxDevCenterLib: *************** *** 218,228 **** install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin - ./modules/wxdc-unix.so: $(WXDC_UNIX_OBJECTS) lib/libwxDevCenterLib.so - $(CXX) -shared -fPIC -o $@ $(WXDC_UNIX_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib -lwxDevCenterLib -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 $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< --- 212,215 ---- *************** *** 270,273 **** --- 257,263 ---- $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_FileSystemStandard_unix.o: ./src/unix/FileSystemStandard-unix.cpp + $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_FileTools.o: ./src/FileTools.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 279,285 **** --- 269,281 ---- $(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) $< *************** *** 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 --- 302,306 ---- $(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $< ! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -d -r1.11.2.1 -r1.11.2.2 *** wxDevCenter.bkl 21 Sep 2005 15:00:38 -0000 1.11.2.1 --- wxDevCenter.bkl 24 Sep 2005 12:45:44 -0000 1.11.2.2 *************** *** 9,13 **** <!-- Standard modules. --> ! <if cond="PLATFORM_WIN32=='1'"> <include file="build/bakefiles/wxDevCenter-msw.bkl" /> </if> --- 9,13 ---- <!-- Standard modules. --> ! <!-- <if cond="PLATFORM_WIN32=='1'"> <include file="build/bakefiles/wxDevCenter-msw.bkl" /> </if> *************** *** 15,19 **** <include file="build/bakefiles/wxDevCenter-unix.bkl" /> </if> ! <!-- Installation rules. --> <include file="build/bakefiles/install.bkl" /> --- 15,19 ---- <include file="build/bakefiles/wxDevCenter-unix.bkl" /> </if> ! --> <!-- Installation rules. --> <include file="build/bakefiles/install.bkl" /> |
