|
From: Emilien K. <cur...@us...> - 2005-08-25 20:36:17
|
Update of /cvsroot/wxdevcenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32099 Modified Files: StdPlugin.bkl GNUmakefile Log Message: Rearrange bakefile and source file hierarchy. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/GNUmakefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** GNUmakefile 25 Aug 2005 17:06:39 -0000 1.8 --- GNUmakefile 25 Aug 2005 20:36:08 -0000 1.9 *************** *** 138,143 **** install: all install_Text install_Bitmap $(INSTALL) -d $(prefix)/include/wxDevCenter ! for f in StdPlugin.h StdPlugin/BitmapCtrl.h StdPlugin/BitmapDocView.h StdPlugin/BitmapProp.h StdPlugin/Controls.h StdPlugin/extmouse.h StdPlugin/language.h StdPlugin/SimpleTextDocView.h; do \ if test ! -d $(prefix)/include/wxDevCenter/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/include/wxDevCenter/`dirname $$f`; \ --- 138,150 ---- install: all install_Text install_Bitmap + $(INSTALL) -d $(prefix)/share/wxDevCenter/plugins + for f in StdPlugin.Text/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/wxDevCenter ! for f in StdPlugin/Bitmap/BitmapCtrl.h StdPlugin/Bitmap/BitmapDocView.h StdPlugin/Bitmap/BitmapProp.h; do \ if test ! -d $(prefix)/include/wxDevCenter/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/include/wxDevCenter/`dirname $$f`; \ *************** *** 146,156 **** done $(INSTALL) -d $(prefix)/share/wxDevCenter/data - for f in icons/filetypes/bmp.ico icons/StdPlugin.Bitmap/brush.png icons/StdPlugin.Bitmap/ellipse.png icons/StdPlugin.Bitmap/handdraw.png icons/StdPlugin.Bitmap/line.png icons/StdPlugin.Bitmap/rect.png icons/StdPlugin.Bitmap/rrect.png icons/StdPlugin.Bitmap/selall.png icons/StdPlugin.Bitmap/selcopy.png icons/StdPlugin.Bitmap/selcut.png icons/StdPlugin.Bitmap/selection.png icons/StdPlugin.Bitmap/selmove.png icons/StdPlugin.Bitmap/selpaste.png icons/StdPlugin.Bitmap/selremove.png icons/StdPlugin.Bitmap/sizeall.png icons/StdPlugin.Bitmap/spray.png icons/StdPlugin.Bitmap/dot.png icons/StdPlugin.Bitmap/dot_dash.png icons/StdPlugin.Bitmap/long_dash.png icons/StdPlugin.Bitmap/short_dash.png icons/StdPlugin.Bitmap/solid.png icons/StdPlugin.Bitmap/transparent.png icons/StdPlugin.Bitmap/landscape.png icons/StdPlugin.Bitmap/portrait.png; do \ - if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ - $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ - fi; \ - $(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \ - done - $(INSTALL) -d $(prefix)/share/wxDevCenter/data for f in icons/filetypes/txt.ico icons/scintilla.png; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ --- 153,156 ---- *************** *** 159,171 **** $(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \ done ! $(INSTALL) -d $(prefix)/share/wxDevCenter/features ! for f in StdPlugin/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/wxDevCenter/plugins ! for f in StdPlugin.Bitmap/plugin.xml StdPlugin.Text/plugin.xml; do \ if test ! -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f`; \ --- 159,171 ---- $(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \ done ! $(INSTALL) -d $(prefix)/share/wxDevCenter/conf ! for f in StdPlugin.Text.conf StdPlugin.Text/.conf StdPlugin.Text/ADA.conf StdPlugin.Text/APDL.conf StdPlugin.Text/ASM.conf StdPlugin.Text/ASP.conf StdPlugin.Text/AU3.conf StdPlugin.Text/AVE.conf StdPlugin.Text/BAAM.conf StdPlugin.Text/BASH.conf StdPlugin.Text/Batch.conf StdPlugin.Text/Bullant.conf StdPlugin.Text/CLW-no-case.conf StdPlugin.Text/CLW.conf StdPlugin.Text/Config.conf StdPlugin.Text/CPP-no-case.conf StdPlugin.Text/CPP.conf StdPlugin.Text/CSS.conf StdPlugin.Text/Diff.conf StdPlugin.Text/Eiffel.conf StdPlugin.Text/EiffelKW.conf StdPlugin.Text/ERLANG.conf StdPlugin.Text/Error-list.conf StdPlugin.Text/ESCRIPT.conf StdPlugin.Text/F77.conf StdPlugin.Text/FORTH.conf StdPlugin.Text/Fortran.conf StdPlugin.Text/GUI2CLI.conf StdPlugin.Text/HTML.conf StdPlugin.Text/KIX.conf StdPlugin.Text/LaTeX.conf StdPlugin.Text/Lisp.conf StdPlugin.Text/LOT.conf StdPlugin.Text/LOUT.conf StdPlugin.Text/LUA.conf StdPlugin.Text/Makefile.conf StdPlugin.Text/MATLab.conf StdPlugin.Text/METAPOST.conf StdPlugin.Text/MMIXAL.conf StdPlugin.Text/MS-SQL.conf StdPlugin.Text/NN-Cron-Table.conf StdPlugin.Text/NSIS.conf StdPlugin.Text/Octave.conf StdPlugin.Text/Pascal.conf StdPlugin.Text/Perl.conf StdPlugin.Text/PHP.conf StdPlugin.Text/POV.conf StdPlugin.Text/Power-Basic.conf StdPlugin.Text/Properties.conf StdPlugin.Text/PS.conf StdPlugin.Text/Python.conf StdPlugin.Text/Ruby.conf StdPlugin.Text/Scriptol.conf StdPlugin.Text/SPECMAN.conf StdPlugin.Text/SQL.conf StdPlugin.Text/TCL.conf StdPlugin.Text/TeX.conf StdPlugin.Text/Text.conf StdPlugin.Text/Verilog.conf StdPlugin.Text/Visual-Basic-Script.conf StdPlugin.Text/Visual-Basic.conf StdPlugin.Text/XCode.conf StdPlugin.Text/XML.conf StdPlugin.Text/YAML.conf; do \ ! if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ ! $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ fi; \ ! $(INSTALL) -m 644 conf//$$f $(prefix)/share/wxDevCenter/conf/$$f; \ done $(INSTALL) -d $(prefix)/share/wxDevCenter/plugins ! for f in StdPlugin.Bitmap/plugin.xml; do \ if test ! -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f`; \ *************** *** 173,178 **** $(INSTALL) -m 644 plugins//$$f $(prefix)/share/wxDevCenter/plugins/$$f; \ done $(INSTALL) -d $(prefix)/share/wxDevCenter/conf ! for f in StdPlugin.Bitmap.conf StdPlugin.Text.conf StdPlugin.Text/.conf StdPlugin.Text/ADA.conf StdPlugin.Text/APDL.conf StdPlugin.Text/ASM.conf StdPlugin.Text/ASP.conf StdPlugin.Text/AU3.conf StdPlugin.Text/AVE.conf StdPlugin.Text/BAAM.conf StdPlugin.Text/BASH.conf StdPlugin.Text/Batch.conf StdPlugin.Text/Bullant.conf StdPlugin.Text/CLW-no-case.conf StdPlugin.Text/CLW.conf StdPlugin.Text/Config.conf StdPlugin.Text/CPP-no-case.conf StdPlugin.Text/CPP.conf StdPlugin.Text/CSS.conf StdPlugin.Text/Diff.conf StdPlugin.Text/Eiffel.conf StdPlugin.Text/EiffelKW.conf StdPlugin.Text/ERLANG.conf StdPlugin.Text/Error-list.conf StdPlugin.Text/ESCRIPT.conf StdPlugin.Text/F77.conf StdPlugin.Text/FORTH.conf StdPlugin.Text/Fortran.conf StdPlugin.Text/GUI2CLI.conf StdPlugin.Text/HTML.conf StdPlugin.Text/KIX.conf StdPlugin.Text/LaTeX.conf StdPlugin.Text/Lisp.conf StdPlugin.Text/LOT.conf StdPlugin.Text/LOUT.conf StdPlugin.Text/LUA.conf StdPlugin.Text/Makefile.conf StdPlugin.Text/MATLab.conf StdPlugin.Text/METAPOST.conf StdPlugin.Text/MMIXAL.conf StdPlugin.Text/MS-SQL.conf StdPlugin.Text/NN-Cron-Table.conf StdPlugin.Text/NSIS.conf StdPlugin.Text/Octave.conf StdPlugin.Text/Pascal.conf StdPlugin.Text/Perl.conf StdPlugin.Text/PHP.conf StdPlugin.Text/POV.conf StdPlugin.Text/Power-Basic.conf StdPlugin.Text/Properties.conf StdPlugin.Text/PS.conf StdPlugin.Text/Python.conf StdPlugin.Text/Ruby.conf StdPlugin.Text/Scriptol.conf StdPlugin.Text/SPECMAN.conf StdPlugin.Text/SQL.conf StdPlugin.Text/TCL.conf StdPlugin.Text/TeX.conf StdPlugin.Text/Text.conf StdPlugin.Text/Verilog.conf StdPlugin.Text/Visual-Basic-Script.conf StdPlugin.Text/Visual-Basic.conf StdPlugin.Text/XCode.conf StdPlugin.Text/XML.conf StdPlugin.Text/YAML.conf; do \ if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ --- 173,192 ---- $(INSTALL) -m 644 plugins//$$f $(prefix)/share/wxDevCenter/plugins/$$f; \ done + $(INSTALL) -d $(prefix)/include/wxDevCenter + for f in StdPlugin/Bitmap/BitmapCtrl.h StdPlugin/Bitmap/BitmapDocView.h StdPlugin/Bitmap/BitmapProp.h; do \ + if test ! -d $(prefix)/include/wxDevCenter/`dirname $$f` ; then \ + $(INSTALL) -d $(prefix)/include/wxDevCenter/`dirname $$f`; \ + fi; \ + $(INSTALL) -m 644 include/wxDevCenter//$$f $(prefix)/include/wxDevCenter/$$f; \ + done + $(INSTALL) -d $(prefix)/share/wxDevCenter/data + for f in icons/filetypes/bmp.ico icons/StdPlugin.Bitmap/brush.png icons/StdPlugin.Bitmap/ellipse.png icons/StdPlugin.Bitmap/handdraw.png icons/StdPlugin.Bitmap/line.png icons/StdPlugin.Bitmap/rect.png icons/StdPlugin.Bitmap/rrect.png icons/StdPlugin.Bitmap/selall.png icons/StdPlugin.Bitmap/selcopy.png icons/StdPlugin.Bitmap/selcut.png icons/StdPlugin.Bitmap/selection.png icons/StdPlugin.Bitmap/selmove.png icons/StdPlugin.Bitmap/selpaste.png icons/StdPlugin.Bitmap/selremove.png icons/StdPlugin.Bitmap/sizeall.png icons/StdPlugin.Bitmap/spray.png icons/StdPlugin.Bitmap/dot.png icons/StdPlugin.Bitmap/dot_dash.png icons/StdPlugin.Bitmap/long_dash.png icons/StdPlugin.Bitmap/short_dash.png icons/StdPlugin.Bitmap/solid.png icons/StdPlugin.Bitmap/transparent.png icons/StdPlugin.Bitmap/landscape.png icons/StdPlugin.Bitmap/portrait.png; do \ + if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ + $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ + fi; \ + $(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \ + done $(INSTALL) -d $(prefix)/share/wxDevCenter/conf ! for f in StdPlugin.Bitmap.conf; do \ if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ *************** *** 180,183 **** --- 194,211 ---- $(INSTALL) -m 644 conf//$$f $(prefix)/share/wxDevCenter/conf/$$f; \ done + $(INSTALL) -d $(prefix)/include/wxDevCenter + for f in StdPlugin.h StdPlugin/Controls.h StdPlugin/extmouse.h StdPlugin/language.h; do \ + if test ! -d $(prefix)/include/wxDevCenter/`dirname $$f` ; then \ + $(INSTALL) -d $(prefix)/include/wxDevCenter/`dirname $$f`; \ + fi; \ + $(INSTALL) -m 644 include/wxDevCenter//$$f $(prefix)/include/wxDevCenter/$$f; \ + done + $(INSTALL) -d $(prefix)/share/wxDevCenter/features + for f in StdPlugin/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 uninstall: *************** *** 210,223 **** $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/Text_SimpleTextDocView.o: ./src/SimpleTextDocView.cpp $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/Bitmap_BitmapCtrl.o: ./src/BitmapCtrl.cpp $(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/Bitmap_BitmapDocView.o: ./src/BitmapDocView.cpp $(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/Bitmap_BitmapProp.o: ./src/BitmapProp.cpp $(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $< --- 238,251 ---- $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/Text_SimpleTextDocView.o: ./src/Text/SimpleTextDocView.cpp $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/Bitmap_BitmapCtrl.o: ./src/Bitmap/BitmapCtrl.cpp $(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/Bitmap_BitmapDocView.o: ./src/Bitmap/BitmapDocView.cpp $(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/Bitmap_BitmapProp.o: ./src/Bitmap/BitmapProp.cpp $(CXX) -c -o $@ $(BITMAP_CXXFLAGS) $(CPPDEPS) $< Index: StdPlugin.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/StdPlugin.bkl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StdPlugin.bkl 25 Apr 2005 15:40:13 -0000 1.5 --- StdPlugin.bkl 25 Aug 2005 20:36:08 -0000 1.6 *************** *** 2,8 **** <makefile> ! <include file="build/wx.bkl" /> ! <include file="build/StdPlugin.bkl" /> ! <include file="build/install.bkl" /> --- 2,12 ---- <makefile> ! <include file="build/bakefiles/wx.bkl" /> ! <include file="build/bakefiles/StdPlugin.bkl" /> ! ! <include file="build/bakefiles/Text.bkl" /> ! <include file="build/bakefiles/Bitmap.bkl" /> ! ! <include file="build/bakefiles/install.bkl" /> |