[Wxdevcenter-cvs] wxDevCenter wxDevCenter.bkl,1.11.2.2,1.11.2.3 GNUmakefile,1.11.2.3,1.11.2.4

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
      Tag: modularisation
	wxDevCenter.bkl GNUmakefile 
Log Message:
Change module to plugin.

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -C2 -d -r1.11.2.3 -r1.11.2.4
*** GNUmakefile	24 Sep 2005 12:45:44 -0000	1.11.2.3
--- GNUmakefile	29 Sep 2005 17:05:01 -0000	1.11.2.4
***************
*** 76,88 ****
  	./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 \
  	./build/$(BUILD)/wxDevCenterLib_Plugin.o \
  	./build/$(BUILD)/wxDevCenterLib_Project.o \
--- 76,84 ----
***************
*** 95,105 ****
  WXDEVCENTER_OBJECTS =  \
  	./build/$(BUILD)/wxDevCenter_AppImpl.o

  ### Conditionally set variables: ###

  ifeq ($(BUILD),debug)
- SUFFIX = D
- endif
- ifeq ($(BUILD),debug)
  ifeq ($(UNICODE),1)
  WXLIBPOSTFIX = ud
--- 91,111 ----
  WXDEVCENTER_OBJECTS =  \
  	./build/$(BUILD)/wxDevCenter_AppImpl.o
+ WXDC.FS.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.FS.UNIX_OBJECTS =  \
+ 	./build/$(BUILD)/wxdc.fs.unix_FileSystemStandard_unix.o
+ WXDC.UI.FRAMES_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.UI.FRAMES_OBJECTS =  \
+ 	./build/$(BUILD)/wxdc.ui.frames_MainFrame.o \
+ 	./build/$(BUILD)/wxdc.ui.frames_MDIFrame.o

  ### Conditionally set variables: ###

  ifeq ($(BUILD),debug)
  ifeq ($(UNICODE),1)
  WXLIBPOSTFIX = ud
***************
*** 126,135 ****
  endif
  ifeq ($(BUILD),debug)
- FREEDESKTOP_MENU_FILE = wxdevcenterd.desktop
- endif
- ifeq ($(BUILD),release)
- FREEDESKTOP_MENU_FILE = wxdevcenter.desktop
- endif
- ifeq ($(BUILD),debug)
  __WARNINGS = -W -Wall
  endif
--- 132,135 ----
***************
*** 166,174 ****
  ### 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 \
  	if test ! -d $(prefix)/include/`dirname $$f` ; then \
  	$(INSTALL) -d $(prefix)/include/`dirname $$f`; \
--- 166,181 ----
  ### Targets: ###

! all: lib/libwxDevCenterLib.so ./bin/wxDevCenter ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so

! install: all install_wxDevCenterLib install_wxDevCenter install_wxdc.fs.unix install_wxdc.ui.frames
! 	$(INSTALL) -d $(prefix)/share/wxDevCenter/plugins
! 	for f in wxdc.fs.msw/plugin.xml wxdc.fs.unix/plugin.xml wxdc.ui.frames/plugin.xml; do \
! 	if test ! -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f` ; then \
! 	$(INSTALL) -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f`; \
! 	fi; \
! 	$(INSTALL) -m 644 plugins//$$f $(prefix)/share/wxDevCenter/plugins/$$f; \
! 	done
  	$(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/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`; \
***************
*** 183,188 ****
  	$(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \
  	done
  	$(INSTALL) -d $(prefix)/share/applications
! 	(cd data/ ; $(INSTALL) -m 644  $(FREEDESKTOP_MENU_FILE) $(prefix)/share/applications)
  	$(INSTALL) -d $(prefix)/share/pixmaps
  	(cd data/icons/ ; $(INSTALL) -m 644  wxDevCenter.png $(prefix)/share/pixmaps)
--- 190,202 ----
  	$(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \
  	done
+ 	$(INSTALL) -d $(prefix)/share/wxDevCenter/features
+ 	for f in wxdc/feature.xml; do \
+ 	if test ! -d $(prefix)/share/wxDevCenter/features/`dirname $$f` ; then \
+ 	$(INSTALL) -d $(prefix)/share/wxDevCenter/features/`dirname $$f`; \
+ 	fi; \
+ 	$(INSTALL) -m 644 features//$$f $(prefix)/share/wxDevCenter/features/$$f; \
+ 	done
  	$(INSTALL) -d $(prefix)/share/applications
! 	(cd data/ ; $(INSTALL) -m 644  $wxdevcenter.desktop $(prefix)/share/applications)
  	$(INSTALL) -d $(prefix)/share/pixmaps
  	(cd data/icons/ ; $(INSTALL) -m 644  wxDevCenter.png $(prefix)/share/pixmaps)
***************
*** 195,199 ****
  	rm -f lib/libwxDevCenterLib.so
  	rm -f lib/libwxDevCenterLib.so
! 	rm -f ./bin/wxDevCenter$(SUFFIX)

  lib/libwxDevCenterLib.so: $(WXDEVCENTERLIB_OBJECTS)
--- 209,217 ----
  	rm -f lib/libwxDevCenterLib.so
  	rm -f lib/libwxDevCenterLib.so
! 	rm -f ./bin/wxDevCenter
! 	rm -f ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so
! 	rm -f ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so
! 	rm -f ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so
! 	rm -f ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so

  lib/libwxDevCenterLib.so: $(WXDEVCENTERLIB_OBJECTS)
***************
*** 205,214 ****
  	install -c lib/libwxDevCenterLib.so $(prefix)/lib

! ./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: 
  	$(INSTALL) -d $(prefix)/bin
! 	install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin

  ./build/$(BUILD)/wxDevCenterLib_AboutBox.o: ./src/AboutBox.cpp
--- 223,248 ----
  	install -c lib/libwxDevCenterLib.so $(prefix)/lib

! ./bin/wxDevCenter: $(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: 
  	$(INSTALL) -d $(prefix)/bin
! 	install -c ./bin/wxDevCenter $(prefix)/bin
! 
! ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so: $(WXDC.FS.UNIX_OBJECTS) lib/libwxDevCenterLib.so
! 	$(CXX) -shared -fPIC -o $@ $(WXDC.FS.UNIX_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib  -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxDevCenterLib
! 
! install_wxdc.fs.unix: 
! 	$(INSTALL) -d $(prefix)/lib/wxDevCenter/plugins/wxdc.fs.unix
! 	$(INSTALL) -m 644 ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.fs.unix
! 	install -c ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.fs.unix
! 
! ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so: $(WXDC.UI.FRAMES_OBJECTS) lib/libwxDevCenterLib.so
! 	$(CXX) -shared -fPIC -o $@ $(WXDC.UI.FRAMES_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib  -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxdockit-$(WXDOCKIT_VERSION) -lwxDevCenterLib
! 
! install_wxdc.ui.frames: 
! 	$(INSTALL) -d $(prefix)/lib/wxDevCenter/plugins/wxdc.ui.frames
! 	$(INSTALL) -m 644 ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.ui.frames
! 	install -c ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.ui.frames

  ./build/$(BUILD)/wxDevCenterLib_AboutBox.o: ./src/AboutBox.cpp
***************
*** 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) $<
--- 291,294 ----
***************
*** 269,287 ****
  	$(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) $<

- ./build/$(BUILD)/wxDevCenterLib_Module.o: ./src/Module.cpp
- 	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
- 
  ./build/$(BUILD)/wxDevCenterLib_Plugin.o: ./src/Plugin.cpp
  	$(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $<
--- 300,309 ----
***************
*** 302,306 ****
  	$(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $<

! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter

--- 324,337 ----
  	$(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $<

! ./build/$(BUILD)/wxdc.fs.unix_FileSystemStandard_unix.o: ./src/unix/FileSystemStandard-unix.cpp
! 	$(CXX) -c -o $@ $(WXDC.FS.UNIX_CXXFLAGS) $(CPPDEPS) $<
! 
! ./build/$(BUILD)/wxdc.ui.frames_MainFrame.o: ./src/MainFrame.cpp
! 	$(CXX) -c -o $@ $(WXDC.UI.FRAMES_CXXFLAGS) $(CPPDEPS) $<
! 
! ./build/$(BUILD)/wxdc.ui.frames_MDIFrame.o: ./src/MDIFrame.cpp
! 	$(CXX) -c -o $@ $(WXDC.UI.FRAMES_CXXFLAGS) $(CPPDEPS) $<
! 
! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter install_wxdc.fs.unix install_wxdc.ui.frames

Index: wxDevCenter.bkl
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -C2 -d -r1.11.2.2 -r1.11.2.3
*** wxDevCenter.bkl	24 Sep 2005 12:45:44 -0000	1.11.2.2
--- wxDevCenter.bkl	29 Sep 2005 17:05:01 -0000	1.11.2.3
***************
*** 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" /> 