[wxdevcenter-commits] SF.net SVN: wxdevcenter:[58] trunk/wxdevcenter/src

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

Revision: 58
          http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=58&view=rev
Author:   cursorstar
Date:     2009-09-11 06:10:29 +0000 (Fri, 11 Sep 2009)

Log Message:
-----------
Simplify build.

Modified Paths:
--------------
    trunk/wxdevcenter/src/Makefile.am
    trunk/wxdevcenter/src/Makefile.in
    trunk/wxdevcenter/src/docview/Makefile.am
    trunk/wxdevcenter/src/docview/Makefile.in
    trunk/wxdevcenter/src/sys/Makefile.am
    trunk/wxdevcenter/src/sys/Makefile.in
    trunk/wxdevcenter/src/tools/Makefile
    trunk/wxdevcenter/src/tools/Makefile.am
    trunk/wxdevcenter/src/tools/Makefile.in
    trunk/wxdevcenter/src/ui/Makefile.am
    trunk/wxdevcenter/src/ui/Makefile.in
    trunk/wxdevcenter/src/ui/dialog/Makefile.am
    trunk/wxdevcenter/src/ui/dialog/Makefile.in

Modified: trunk/wxdevcenter/src/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/Makefile.am	2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/Makefile.am	2009-09-11 06:10:29 UTC (rev 58)
@@ -25,18 +25,51 @@
 lib_LTLIBRARIES = \
 	libwxdevcenter.la
 
-libwxdevcenter_la_SOURCES = 
+libwxdevcenter_la_SOURCES =  \
+    sys/iterator.hpp  \
+	sys/action.hpp  \
+	sys/action.cpp \
+	sys/manager.hpp  \
+	sys/manager.cpp  \
+	sys/plugin.hpp  \
+	sys/plugin.cpp  \
+	sys/config.hpp  \
+	sys/config.cpp  \
+	sys/task.hpp  \
+	sys/task.cpp  \
+	sys/bookmark.hpp  \
+	sys/bookmark.cpp  \
+	sys/search.hpp  \
+	sys/search.cpp  \
+	tools/bitvector.hpp  \
+	tools/bitvector.cpp  \
+    docview/document.hpp  \
+	docview/document.cpp \
+	docview/view.hpp  \
+	docview/view.cpp  \
+	docview/project.hpp  \
+	docview/project.cpp  \
+	docview/workspace.hpp  \
+	docview/workspace.cpp \
+	ui/dialog/newdocument.hpp  \
+	ui/dialog/newdocument.cpp \
+	ui/dialog/opendocument.hpp  \
+	ui/dialog/opendocument.cpp  \
+	ui/frame.hpp  \
+	ui/frame.cpp \
+	ui/perspective.hpp  \
+	ui/perspective.cpp \
+	ui/workbar.hpp  \
+	ui/workbar.cpp  \
+	ui/configui.hpp  \
+	ui/configui.cpp  \
+	ui/art.hpp  \
+	ui/art.cpp
 
+
 libwxdevcenter_la_LIBADD = \
-    ui/libui.la  \
-    ui/libuistd.la  \
-    ui/dialog/libuidialog.la  \
-    sys/libsys.la  \
-    tools/libtools.la \
-    docview/libdocview.la
+    ui/libuistd.la
 
-
-
 bin_PROGRAMS = wxdevcenter
 
 wxdevcenter_SOURCES = \

Modified: trunk/wxdevcenter/src/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/Makefile.in	2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/Makefile.in	2009-09-11 06:10:29 UTC (rev 58)
@@ -52,10 +52,12 @@
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libwxdevcenter_la_DEPENDENCIES = ui/libui.la ui/libuistd.la \
-	ui/dialog/libuidialog.la sys/libsys.la tools/libtools.la \
-	docview/libdocview.la
-am_libwxdevcenter_la_OBJECTS =
+libwxdevcenter_la_DEPENDENCIES = ui/libuistd.la
+am_libwxdevcenter_la_OBJECTS = action.lo manager.lo plugin.lo \
+	config.lo task.lo bookmark.lo search.lo bitvector.lo \
+	document.lo view.lo project.lo workspace.lo newdocument.lo \
+	opendocument.lo frame.lo perspective.lo workbar.lo configui.lo \
+	art.lo
 libwxdevcenter_la_OBJECTS = $(am_libwxdevcenter_la_OBJECTS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -285,14 +287,49 @@
 lib_LTLIBRARIES = \
 	libwxdevcenter.la
 
-libwxdevcenter_la_SOURCES = 
+libwxdevcenter_la_SOURCES = \
+    sys/iterator.hpp  \
+	sys/action.hpp  \
+	sys/action.cpp \
+	sys/manager.hpp  \
+	sys/manager.cpp  \
+	sys/plugin.hpp  \
+	sys/plugin.cpp  \
+	sys/config.hpp  \
+	sys/config.cpp  \
+	sys/task.hpp  \
+	sys/task.cpp  \
+	sys/bookmark.hpp  \
+	sys/bookmark.cpp  \
+	sys/search.hpp  \
+	sys/search.cpp  \
+	tools/bitvector.hpp  \
+	tools/bitvector.cpp  \
+    docview/document.hpp  \
+	docview/document.cpp \
+	docview/view.hpp  \
+	docview/view.cpp  \
+	docview/project.hpp  \
+	docview/project.cpp  \
+	docview/workspace.hpp  \
+	docview/workspace.cpp \
+	ui/dialog/newdocument.hpp  \
+	ui/dialog/newdocument.cpp \
+	ui/dialog/opendocument.hpp  \
+	ui/dialog/opendocument.cpp  \
+	ui/frame.hpp  \
+	ui/frame.cpp \
+	ui/perspective.hpp  \
+	ui/perspective.cpp \
+	ui/workbar.hpp  \
+	ui/workbar.cpp  \
+	ui/configui.hpp  \
+	ui/configui.cpp  \
+	ui/art.hpp  \
+	ui/art.cpp
+
 libwxdevcenter_la_LIBADD = \
-    ui/libui.la  \
-    ui/libuistd.la  \
-    ui/dialog/libuidialog.la  \
-    sys/libsys.la  \
-    tools/libtools.la \
-    docview/libdocview.la
+    ui/libuistd.la
 
 wxdevcenter_SOURCES = \
 	application.cpp  \
@@ -366,7 +403,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libwxdevcenter.la: $(libwxdevcenter_la_OBJECTS) $(libwxdevcenter_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libwxdevcenter_la_OBJECTS) $(libwxdevcenter_la_LIBADD) $(LIBS)
+	$(CXXLINK) -rpath $(libdir) $(libwxdevcenter_la_OBJECTS) $(libwxdevcenter_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -405,7 +442,26 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/action.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/application.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/art.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitvector.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bookmark.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configui.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/document.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newdocument.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opendocument.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perspective.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/project.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workbar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workspace.Plo@am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -428,6 +484,139 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
+action.lo: sys/action.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT action.lo -MD -MP -MF $(DEPDIR)/action.Tpo -c -o action.lo `test -f 'sys/action.cpp' || echo '$(srcdir)/'`sys/action.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/action.Tpo $(DEPDIR)/action.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sys/action.cpp' object='action.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o action.lo `test -f 'sys/action.cpp' || echo '$(srcdir)/'`sys/action.cpp
+
+manager.lo: sys/manager.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT manager.lo -MD -MP -MF $(DEPDIR)/manager.Tpo -c -o manager.lo `test -f 'sys/manager.cpp' || echo '$(srcdir)/'`sys/manager.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/manager.Tpo $(DEPDIR)/manager.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sys/manager.cpp' object='manager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o manager.lo `test -f 'sys/manager.cpp' || echo '$(srcdir)/'`sys/manager.cpp
+
+plugin.lo: sys/plugin.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plugin.lo -MD -MP -MF $(DEPDIR)/plugin.Tpo -c -o plugin.lo `test -f 'sys/plugin.cpp' || echo '$(srcdir)/'`sys/plugin.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/plugin.Tpo $(DEPDIR)/plugin.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sys/plugin.cpp' object='plugin.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plugin.lo `test -f 'sys/plugin.cpp' || echo '$(srcdir)/'`sys/plugin.cpp
+
+config.lo: sys/config.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.lo -MD -MP -MF $(DEPDIR)/config.Tpo -c -o config.lo `test -f 'sys/config.cpp' || echo '$(srcdir)/'`sys/config.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/config.Tpo $(DEPDIR)/config.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sys/config.cpp' object='config.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.lo `test -f 'sys/config.cpp' || echo '$(srcdir)/'`sys/config.cpp
+
+task.lo: sys/task.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT task.lo -MD -MP -MF $(DEPDIR)/task.Tpo -c -o task.lo `test -f 'sys/task.cpp' || echo '$(srcdir)/'`sys/task.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/task.Tpo $(DEPDIR)/task.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sys/task.cpp' object='task.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o task.lo `test -f 'sys/task.cpp' || echo '$(srcdir)/'`sys/task.cpp
+
+bookmark.lo: sys/bookmark.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bookmark.lo -MD -MP -MF $(DEPDIR)/bookmark.Tpo -c -o bookmark.lo `test -f 'sys/bookmark.cpp' || echo '$(srcdir)/'`sys/bookmark.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bookmark.Tpo $(DEPDIR)/bookmark.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sys/bookmark.cpp' object='bookmark.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bookmark.lo `test -f 'sys/bookmark.cpp' || echo '$(srcdir)/'`sys/bookmark.cpp
+
+search.lo: sys/search.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT search.lo -MD -MP -MF $(DEPDIR)/search.Tpo -c -o search.lo `test -f 'sys/search.cpp' || echo '$(srcdir)/'`sys/search.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/search.Tpo $(DEPDIR)/search.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sys/search.cpp' object='search.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o search.lo `test -f 'sys/search.cpp' || echo '$(srcdir)/'`sys/search.cpp
+
+bitvector.lo: tools/bitvector.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bitvector.lo -MD -MP -MF $(DEPDIR)/bitvector.Tpo -c -o bitvector.lo `test -f 'tools/bitvector.cpp' || echo '$(srcdir)/'`tools/bitvector.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bitvector.Tpo $(DEPDIR)/bitvector.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tools/bitvector.cpp' object='bitvector.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bitvector.lo `test -f 'tools/bitvector.cpp' || echo '$(srcdir)/'`tools/bitvector.cpp
+
+document.lo: docview/document.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT document.lo -MD -MP -MF $(DEPDIR)/document.Tpo -c -o document.lo `test -f 'docview/document.cpp' || echo '$(srcdir)/'`docview/document.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/document.Tpo $(DEPDIR)/document.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='docview/document.cpp' object='document.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o document.lo `test -f 'docview/document.cpp' || echo '$(srcdir)/'`docview/document.cpp
+
+view.lo: docview/view.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT view.lo -MD -MP -MF $(DEPDIR)/view.Tpo -c -o view.lo `test -f 'docview/view.cpp' || echo '$(srcdir)/'`docview/view.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/view.Tpo $(DEPDIR)/view.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='docview/view.cpp' object='view.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o view.lo `test -f 'docview/view.cpp' || echo '$(srcdir)/'`docview/view.cpp
+
+project.lo: docview/project.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT project.lo -MD -MP -MF $(DEPDIR)/project.Tpo -c -o project.lo `test -f 'docview/project.cpp' || echo '$(srcdir)/'`docview/project.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/project.Tpo $(DEPDIR)/project.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='docview/project.cpp' object='project.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o project.lo `test -f 'docview/project.cpp' || echo '$(srcdir)/'`docview/project.cpp
+
+workspace.lo: docview/workspace.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT workspace.lo -MD -MP -MF $(DEPDIR)/workspace.Tpo -c -o workspace.lo `test -f 'docview/workspace.cpp' || echo '$(srcdir)/'`docview/workspace.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/workspace.Tpo $(DEPDIR)/workspace.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='docview/workspace.cpp' object='workspace.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o workspace.lo `test -f 'docview/workspace.cpp' || echo '$(srcdir)/'`docview/workspace.cpp
+
+newdocument.lo: ui/dialog/newdocument.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT newdocument.lo -MD -MP -MF $(DEPDIR)/newdocument.Tpo -c -o newdocument.lo `test -f 'ui/dialog/newdocument.cpp' || echo '$(srcdir)/'`ui/dialog/newdocument.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/newdocument.Tpo $(DEPDIR)/newdocument.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ui/dialog/newdocument.cpp' object='newdocument.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o newdocument.lo `test -f 'ui/dialog/newdocument.cpp' || echo '$(srcdir)/'`ui/dialog/newdocument.cpp
+
+opendocument.lo: ui/dialog/opendocument.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opendocument.lo -MD -MP -MF $(DEPDIR)/opendocument.Tpo -c -o opendocument.lo `test -f 'ui/dialog/opendocument.cpp' || echo '$(srcdir)/'`ui/dialog/opendocument.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/opendocument.Tpo $(DEPDIR)/opendocument.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ui/dialog/opendocument.cpp' object='opendocument.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opendocument.lo `test -f 'ui/dialog/opendocument.cpp' || echo '$(srcdir)/'`ui/dialog/opendocument.cpp
+
+frame.lo: ui/frame.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT frame.lo -MD -MP -MF $(DEPDIR)/frame.Tpo -c -o frame.lo `test -f 'ui/frame.cpp' || echo '$(srcdir)/'`ui/frame.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/frame.Tpo $(DEPDIR)/frame.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ui/frame.cpp' object='frame.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o frame.lo `test -f 'ui/frame.cpp' || echo '$(srcdir)/'`ui/frame.cpp
+
+perspective.lo: ui/perspective.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT perspective.lo -MD -MP -MF $(DEPDIR)/perspective.Tpo -c -o perspective.lo `test -f 'ui/perspective.cpp' || echo '$(srcdir)/'`ui/perspective.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/perspective.Tpo $(DEPDIR)/perspective.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ui/perspective.cpp' object='perspective.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o perspective.lo `test -f 'ui/perspective.cpp' || echo '$(srcdir)/'`ui/perspective.cpp
+
+workbar.lo: ui/workbar.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT workbar.lo -MD -MP -MF $(DEPDIR)/workbar.Tpo -c -o workbar.lo `test -f 'ui/workbar.cpp' || echo '$(srcdir)/'`ui/workbar.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/workbar.Tpo $(DEPDIR)/workbar.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ui/workbar.cpp' object='workbar.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o workbar.lo `test -f 'ui/workbar.cpp' || echo '$(srcdir)/'`ui/workbar.cpp
+
+configui.lo: ui/configui.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT configui.lo -MD -MP -MF $(DEPDIR)/configui.Tpo -c -o configui.lo `test -f 'ui/configui.cpp' || echo '$(srcdir)/'`ui/configui.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/configui.Tpo $(DEPDIR)/configui.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ui/configui.cpp' object='configui.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o configui.lo `test -f 'ui/configui.cpp' || echo '$(srcdir)/'`ui/configui.cpp
+
+art.lo: ui/art.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT art.lo -MD -MP -MF $(DEPDIR)/art.Tpo -c -o art.lo `test -f 'ui/art.cpp' || echo '$(srcdir)/'`ui/art.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/art.Tpo $(DEPDIR)/art.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ui/art.cpp' object='art.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o art.lo `test -f 'ui/art.cpp' || echo '$(srcdir)/'`ui/art.cpp
+
 mostlyclean-libtool:
 	-rm -f *.lo
 

Modified: trunk/wxdevcenter/src/docview/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/docview/Makefile.am	2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/docview/Makefile.am	2009-09-11 06:10:29 UTC (rev 58)
@@ -1,19 +1,5 @@
 
-INCLUDES = \
-	$(WX_CXXFLAGS)
 
-noinst_LTLIBRARIES = libdocview.la
 
-libdocview_la_SOURCES = \
-    document.hpp  \
-	document.cpp \
-	view.hpp  \
-	view.cpp  \
-	project.hpp  \
-	project.cpp  \
-	workspace.hpp  \
-	workspace.cpp
-
-
 ## File created by the gnome-build tools
 

Modified: trunk/wxdevcenter/src/docview/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/docview/Makefile.in	2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/docview/Makefile.in	2009-09-11 06:10:29 UTC (rev 58)
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -41,35 +40,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libdocview_la_LIBADD =
-am_libdocview_la_OBJECTS = document.lo view.lo project.lo workspace.lo
-libdocview_la_OBJECTS = $(am_libdocview_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libdocview_la_SOURCES)
-DIST_SOURCES = $(libdocview_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
+SOURCES =
+DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -231,24 +203,9 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = \
-	$(WX_CXXFLAGS)
-
-noinst_LTLIBRARIES = libdocview.la
-libdocview_la_SOURCES = \
-    document.hpp  \
-	document.cpp \
-	view.hpp  \
-	view.cpp  \
-	project.hpp  \
-	project.cpp  \
-	workspace.hpp  \
-	workspace.cpp
-
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -279,102 +236,18 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libdocview.la: $(libdocview_la_OBJECTS) $(libdocview_la_DEPENDENCIES) 
-	$(CXXLINK)  $(libdocview_la_OBJECTS) $(libdocview_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/document.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/project.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workspace.Plo@am__quote@
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
 tags: TAGS
+TAGS:
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
 ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+CTAGS:
 
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
 
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -403,7 +276,7 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -431,14 +304,11 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -469,14 +339,12 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-am
 
@@ -490,18 +358,16 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

Modified: trunk/wxdevcenter/src/sys/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/sys/Makefile.am	2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/sys/Makefile.am	2009-09-11 06:10:29 UTC (rev 58)
@@ -1,31 +1,4 @@
 
-INCLUDES = \
-	$(WX_CXXFLAGS)
-
-noinst_LTLIBRARIES = libsys.la
-
-libsys_la_SOURCES = \
-    iterator.hpp  \
-	action.hpp  \
-	action.cpp \
-	manager.hpp  \
-	manager.cpp  \
-	plugin.hpp  \
-	plugin.cpp  \
-	config.hpp  \
-	config.cpp  \
-	task.hpp  \
-	task.cpp  \
-	bookmark.hpp  \
-	bookmark.cpp  \
-	search.hpp  \
-	search.cpp
-
-libsys_la_CXXFLAGS = \
-	-DPLUGIN_LIBDIR="\"$(PLUGIN_LIBDIR)\"" \
-	-DPLUGIN_DATADIR="\"$(PLUGIN_DATADIR)\"" \
-	-DDATADIR="\"$(datadir)\""
-
 ## File created by the gnome-build tools
 
 

Modified: trunk/wxdevcenter/src/sys/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/sys/Makefile.in	2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/sys/Makefile.in	2009-09-11 06:10:29 UTC (rev 58)
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -41,40 +40,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libsys_la_LIBADD =
-am_libsys_la_OBJECTS = libsys_la-action.lo libsys_la-manager.lo \
-	libsys_la-plugin.lo libsys_la-config.lo libsys_la-task.lo \
-	libsys_la-bookmark.lo libsys_la-search.lo
-libsys_la_OBJECTS = $(am_libsys_la_OBJECTS)
-libsys_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libsys_la_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libsys_la_SOURCES)
-DIST_SOURCES = $(libsys_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
+SOURCES =
+DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -236,36 +203,9 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = \
-	$(WX_CXXFLAGS)
-
-noinst_LTLIBRARIES = libsys.la
-libsys_la_SOURCES = \
-    iterator.hpp  \
-	action.hpp  \
-	action.cpp \
-	manager.hpp  \
-	manager.cpp  \
-	plugin.hpp  \
-	plugin.cpp  \
-	config.hpp  \
-	config.cpp  \
-	task.hpp  \
-	task.cpp  \
-	bookmark.hpp  \
-	bookmark.cpp  \
-	search.hpp  \
-	search.cpp
-
-libsys_la_CXXFLAGS = \
-	-DPLUGIN_LIBDIR="\"$(PLUGIN_LIBDIR)\"" \
-	-DPLUGIN_DATADIR="\"$(PLUGIN_DATADIR)\"" \
-	-DDATADIR="\"$(datadir)\""
-
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -296,154 +236,18 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libsys.la: $(libsys_la_OBJECTS) $(libsys_la_DEPENDENCIES) 
-	$(libsys_la_LINK)  $(libsys_la_OBJECTS) $(libsys_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-action.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-bookmark.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-plugin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-search.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-task.Plo@am__quote@
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-
-libsys_la-action.lo: action.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-action.lo -MD -MP -MF $(DEPDIR)/libsys_la-action.Tpo -c -o libsys_la-action.lo `test -f 'action.cpp' || echo '$(srcdir)/'`action.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libsys_la-action.Tpo $(DEPDIR)/libsys_la-action.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='action.cpp' object='libsys_la-action.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-action.lo `test -f 'action.cpp' || echo '$(srcdir)/'`action.cpp
-
-libsys_la-manager.lo: manager.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-manager.lo -MD -MP -MF $(DEPDIR)/libsys_la-manager.Tpo -c -o libsys_la-manager.lo `test -f 'manager.cpp' || echo '$(srcdir)/'`manager.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libsys_la-manager.Tpo $(DEPDIR)/libsys_la-manager.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='manager.cpp' object='libsys_la-manager.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-manager.lo `test -f 'manager.cpp' || echo '$(srcdir)/'`manager.cpp
-
-libsys_la-plugin.lo: plugin.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-plugin.lo -MD -MP -MF $(DEPDIR)/libsys_la-plugin.Tpo -c -o libsys_la-plugin.lo `test -f 'plugin.cpp' || echo '$(srcdir)/'`plugin.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libsys_la-plugin.Tpo $(DEPDIR)/libsys_la-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='plugin.cpp' object='libsys_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-plugin.lo `test -f 'plugin.cpp' || echo '$(srcdir)/'`plugin.cpp
-
-libsys_la-config.lo: config.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-config.lo -MD -MP -MF $(DEPDIR)/libsys_la-config.Tpo -c -o libsys_la-config.lo `test -f 'config.cpp' || echo '$(srcdir)/'`config.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libsys_la-config.Tpo $(DEPDIR)/libsys_la-config.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='config.cpp' object='libsys_la-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-config.lo `test -f 'config.cpp' || echo '$(srcdir)/'`config.cpp
-
-libsys_la-task.lo: task.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-task.lo -MD -MP -MF $(DEPDIR)/libsys_la-task.Tpo -c -o libsys_la-task.lo `test -f 'task.cpp' || echo '$(srcdir)/'`task.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libsys_la-task.Tpo $(DEPDIR)/libsys_la-task.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='task.cpp' object='libsys_la-task.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-task.lo `test -f 'task.cpp' || echo '$(srcdir)/'`task.cpp
-
-libsys_la-bookmark.lo: bookmark.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-bookmark.lo -MD -MP -MF $(DEPDIR)/libsys_la-bookmark.Tpo -c -o libsys_la-bookmark.lo `test -f 'bookmark.cpp' || echo '$(srcdir)/'`bookmark.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libsys_la-bookmark.Tpo $(DEPDIR)/libsys_la-bookmark.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='bookmark.cpp' object='libsys_la-bookmark.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-bookmark.lo `test -f 'bookmark.cpp' || echo '$(srcdir)/'`bookmark.cpp
-
-libsys_la-search.lo: search.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-search.lo -MD -MP -MF $(DEPDIR)/libsys_la-search.Tpo -c -o libsys_la-search.lo `test -f 'search.cpp' || echo '$(srcdir)/'`search.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libsys_la-search.Tpo $(DEPDIR)/libsys_la-search.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='search.cpp' object='libsys_la-search.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-search.lo `test -f 'search.cpp' || echo '$(srcdir)/'`search.cpp
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
 tags: TAGS
+TAGS:
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
 ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+CTAGS:
 
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
 
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -472,7 +276,7 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -500,14 +304,11 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -538,14 +339,12 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-am
 
@@ -559,18 +358,16 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

Modified: trunk/wxdevcenter/src/tools/Makefile
===================================================================
--- trunk/wxdevcenter/src/tools/Makefile	2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/tools/Makefile	2009-09-11 06:10:29 UTC (rev 58)
@@ -14,7 +14,6 @@
 
 
 
-
 pkgdatadir = $(datadir)/wxdevcenter
 pkglibdir = $(libdir)/wxdevcenter
 pkgincludedir = $(includedir)/wxdevcenter
@@ -41,38 +40,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libtools_la_LIBADD =
-am_libtools_la_OBJECTS = libtools_la-bitvector.lo
-libtools_la_OBJECTS = $(am_libtools_la_OBJECTS)
-libtools_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libtools_la_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libtools_la_SOURCES)
-DIST_SOURCES = $(libtools_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
+SOURCES =
+DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = ${SHELL} /home/mimile/Projects/wxdevcenter/missing --run aclocal-1.10
 ALL_LINGUAS = 
@@ -234,25 +203,9 @@
 top_build_prefix = ../../
 top_builddir = ../..
 top_srcdir = ../..
-INCLUDES = \
-	$(WX_CXXFLAGS)
-
-noinst_LTLIBRARIES = \
-	libtools.la
-
-libtools_la_SOURCES = \
-	bitvector.hpp\
-	bitvector.cpp
-
-libtools_la_CXXFLAGS = \
-	-DPLUGIN_LIBDIR="\"$(PLUGIN_LIBDIR)\"" \
-	-DPLUGIN_DATADIR="\"$(PLUGIN_DATADIR)\"" \
-	-DDATADIR="\"$(datadir)\""
-
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -283,106 +236,18 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libtools.la: $(libtools_la_OBJECTS) $(libtools_la_DEPENDENCIES) 
-	$(libtools_la_LINK)  $(libtools_la_OBJECTS) $(libtools_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/libtools_la-bitvector.Plo
-
-.cpp.o:
-	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-#	source='$<' object='$@' libtool=yes \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(LTCXXCOMPILE) -c -o $@ $<
-
-libtools_la-bitvector.lo: bitvector.cpp
-	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtools_la_CXXFLAGS) $(CXXFLAGS) -MT libtools_la-bitvector.lo -MD -MP -MF $(DEPDIR)/libtools_la-bitvector.Tpo -c -o libtools_la-bitvector.lo `test -f 'bitvector.cpp' || echo '$(srcdir)/'`bitvector.cpp
-	mv -f $(DEPDIR)/libtools_la-bitvector.Tpo $(DEPDIR)/libtools_la-bitvector.Plo
-#	source='bitvector.cpp' object='libtools_la-bitvector.lo' libtool=yes \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtools_la_CXXFLAGS) $(CXXFLAGS) -c -o libtools_la-bitvector.lo `test -f 'bitvector.cpp' || echo '$(srcdir)/'`bitvector.cpp
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
 tags: TAGS
+TAGS:
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
 ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+CTAGS:
 
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
 
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -411,7 +276,7 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -439,14 +304,11 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -477,14 +339,12 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-am
 
@@ -498,18 +358,16 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: all all-am ...
 
[truncated message content]