From 03ad2304eb40a50574b04eef189004954cfa0ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= <gambas@users.sourceforge.net>
Date: Wed, 23 Apr 2008 10:28:33 +0000
Subject: [PATCH] [CONFIGURATION] * NEW: Use the libtool optimizer 'dolt' made
 by Josh Triplett. This should   speed up the all compilation.

[GB.GTK]
* BUG: PictureBox.Alignment property now correctly deals with Align.Normal,
  Align.TopNormal, and Align.BottomNormal alignments.

[GB.QT]
* OPT: The PictureBox control does not flicker anymore when its Picture
  property is changed.

[GB.QTE]
* BUG: No more automake warning about GNU extensions.
* BUG: The component compiles correctly again.


git-svn-id: svn://localhost/gambas/trunk@1335 867c0c6c-44f3-4631-809d-bfa615b0a4ec
---
 acinclude.m4                          | 152 +++++++++++++++++++++++++-
 app/src/gambas3/FMain.form            |   4 +-
 gb.desktop/src/gb.desktop/.project    |   8 +-
 gb.desktop/src/gb.desktop/.settings   |  12 +-
 gb.desktop/src/gb.desktop/Main.module |   2 +-
 gb.gtk/src/gpicturebox.cpp            |  10 +-
 gb.qt/src/CPictureBox.cpp             |  18 +--
 gb.qt/src/CPictureBox.h               |  16 +--
 gb.qt/src/CWindow.cpp                 |  20 ++++
 gb.qte/gb.qte.am                      |   7 +-
 gb.qte/src/Makefile.am                |  77 ++++++-------
 gb.qte/src/ext/Makefile.am            |  10 +-
 12 files changed, 242 insertions(+), 94 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 26e0ad40d..42491d3f9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -77,7 +77,6 @@ AC_DEFUN([GB_INIT_SHORT],
   AC_SUBST(gblibdir)
   gbdatadir=$datadir/gambas$GAMBAS_VERSION
   AC_SUBST(gbdatadir)
-  
 ])
 
 AC_DEFUN([GB_LIBTOOL],
@@ -937,6 +936,149 @@ AC_DEFUN([GB_CHECK_XWINDOW],
 
 ])
 
+## ---------------------------------------------------------------------------
+## DOLT
+## Optimize libtool!
+## ---------------------------------------------------------------------------
+
+dnl dolt, a replacement for libtool
+dnl Copyright © 2007-2008 Josh Triplett <josh@freedesktop.org>
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+dnl
+dnl To use dolt, invoke the DOLT macro immediately after the libtool macros.
+dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it
+dnl installed when running autoconf on your project.
+
+AC_DEFUN([DOLT], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+# dolt, a replacement for libtool
+# Josh Triplett <josh@freedesktop.org>
+AC_PATH_PROG(DOLT_BASH, bash)
+AC_MSG_CHECKING([if dolt supports this host])
+dolt_supported=yes
+if test x$DOLT_BASH = x; then
+    dolt_supported=no
+fi
+if test x$GCC != xyes; then
+    dolt_supported=no
+fi
+case $host in
+i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*) ;;
+amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) ;;
+*) dolt_supported=no ;;
+esac
+if test x$dolt_supported = xno ; then
+    AC_MSG_RESULT([no, falling back to libtool])
+    LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
+    LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
+else
+    AC_MSG_RESULT([yes, replacing libtool])
+
+dnl Start writing out doltcompile.
+    cat <<__DOLTCOMPILE__EOF__ >doltcompile
+#!$DOLT_BASH
+__DOLTCOMPILE__EOF__
+    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+args=("$[]@")
+for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do
+    if test x"${args@<:@$arg@:>@}" = x-o ; then
+        objarg=$((arg+1))
+        break
+    fi
+done
+if test x$objarg = x ; then
+    echo 'Error: no -o on compiler command line' 1>&2
+    exit 1
+fi
+lo="${args@<:@$objarg@:>@}"
+obj="${lo%.lo}"
+if test x"$lo" = x"$obj" ; then
+    echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2
+    exit 1
+fi
+objbase="${obj##*/}"
+__DOLTCOMPILE__EOF__
+
+dnl Write out shared compilation code.
+    if test x$enable_shared = xyes; then
+        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+libobjdir="${obj%$objbase}.libs"
+if test ! -d "$libobjdir" ; then
+    mkdir_out="$(mkdir "$libobjdir" 2>&1)"
+    mkdir_ret=$?
+    if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
+	echo "$mkdir_out" 1>&2
+        exit $mkdir_ret
+    fi
+fi
+pic_object="$libobjdir/$objbase.o"
+args@<:@$objarg@:>@="$pic_object"
+"${args@<:@@@:>@}" -fPIC -DPIC || exit $?
+__DOLTCOMPILE__EOF__
+    fi
+
+dnl Write out static compilation code.
+dnl Avoid duplicate compiler output if also building shared objects.
+    if test x$enable_static = xyes; then
+        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+non_pic_object="$obj.o"
+args@<:@$objarg@:>@="$non_pic_object"
+__DOLTCOMPILE__EOF__
+        if test x$enable_shared = xyes; then
+            cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $?
+__DOLTCOMPILE__EOF__
+        else
+            cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+"${args@<:@@@:>@}" || exit $?
+__DOLTCOMPILE__EOF__
+        fi
+    fi
+
+dnl Write out the code to write the .lo file.
+dnl The second line of the .lo file must match "^# Generated by .*libtool"
+    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+{
+echo "# $lo - a libtool object file"
+echo "# Generated by doltcompile, not libtool"
+__DOLTCOMPILE__EOF__
+
+    if test x$enable_shared = xyes; then
+        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+echo "pic_object='$pic_object'"
+__DOLTCOMPILE__EOF__
+    else
+        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+echo pic_object=none
+__DOLTCOMPILE__EOF__
+    fi
+
+    if test x$enable_static = xyes; then
+        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+echo "non_pic_object='$non_pic_object'"
+__DOLTCOMPILE__EOF__
+    else
+        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+echo non_pic_object=none
+__DOLTCOMPILE__EOF__
+    fi
+
+    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+} > "$lo"
+__DOLTCOMPILE__EOF__
+
+dnl Done writing out doltcompile; substitute it for libtool compilation.
+    chmod +x doltcompile
+    LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
+    LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
+fi
+AC_SUBST(LTCOMPILE)
+AC_SUBST(LTCXXCOMPILE)
+# end dolt
+])
+
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 ## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007
 ## Free Software Foundation, Inc.
@@ -961,7 +1103,7 @@ m4_ifdef([AC_PROVIDE_IFELSE],
 
 # AC_PROG_LIBTOOL
 # ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
+AC_DEFUN([AC_PROG_LIBTOOL_ORG],
 [AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
 dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
 dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
@@ -991,7 +1133,11 @@ dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
        ifdef([LT_AC_PROG_GCJ],
 	     [define([LT_AC_PROG_GCJ],
 		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
+])
+
+])# AC_PROG_LIBTOOL_ORG
+
+AC_DEFUN([AC_PROG_LIBTOOL], [AC_PROG_LIBTOOL_ORG DOLT])
 
 
 # _AC_PROG_LIBTOOL
diff --git a/app/src/gambas3/FMain.form b/app/src/gambas3/FMain.form
index ff0c76e90..9bab105c0 100644
--- a/app/src/gambas3/FMain.form
+++ b/app/src/gambas3/FMain.form
@@ -690,7 +690,7 @@
       Orientation = Align.Right
       Hidden = True
       { tabProperty TabStrip
-        MoveScaled(4,0,26,4)
+        MoveScaled(4,0,26,6)
         Arrangement = Arrange.Fill
         Count = 2
         Index = 0
@@ -700,7 +700,7 @@
         Index = 0
       }
       { panFrame Panel
-        MoveScaled(5,5,22,32)
+        MoveScaled(5,6,22,32)
         Expand = True
         Arrangement = Arrange.Fill
         Border = Border.Raised
diff --git a/gb.desktop/src/gb.desktop/.project b/gb.desktop/src/gb.desktop/.project
index fecbbd492..50a731361 100644
--- a/gb.desktop/src/gb.desktop/.project
+++ b/gb.desktop/src/gb.desktop/.project
@@ -1,9 +1,9 @@
 # Gambas Project File 3.0
 Startup=Main
-Version=0.0.34
-Library=gb.qt
-Library=gb.form
-Library=gb.desktop
+Version=0.0.35
+Component=gb.qt
+Component=gb.form
+Component=gb.desktop
 TabSize=2
 KeepDebugInfo=1
 MakeComponent=1
diff --git a/gb.desktop/src/gb.desktop/.settings b/gb.desktop/src/gb.desktop/.settings
index be018af46..085ad14d8 100644
--- a/gb.desktop/src/gb.desktop/.settings
+++ b/gb.desktop/src/gb.desktop/.settings
@@ -12,12 +12,11 @@ SearchComment=False
 SearchString=True
 
 [OpenFile]
-Active=1
-File[1]="Desktop.class:345.7"
+File[1]="Desktop.class:236.0"
 Fold[1]=[]
 File[2]="_DesktopScreenSaver.class:4.0"
 Fold[2]=[]
-File[3]="Main.module:64.6"
+File[3]="Main.module:61.0"
 Fold[3]=[]
 File[4]="Form1.form"
 File[5]="Form1.class:25.55"
@@ -28,13 +27,16 @@ File[7]="_DesktopMenus.class:0.0"
 Fold[7]=[]
 File[8]="DesktopFile.class:20.0"
 Fold[8]=[]
-File[9]="_DesktopVirtual.class:95.6"
+File[9]="_DesktopVirtual.class:21.0"
 Fold[9]=[]
 File[10]="_DesktopWindows.class:9.34"
 Fold[10]=[]
 File[11]="DesktopWindow.class:98.0"
 Fold[11]=[]
-Count=11
+Active=12
+File[12]="Atom.class:9.0"
+Fold[12]=[]
+Count=12
 
 [Watches]
 Count=0
diff --git a/gb.desktop/src/gb.desktop/Main.module b/gb.desktop/src/gb.desktop/Main.module
index 8764e8c9a..46455f9d3 100644
--- a/gb.desktop/src/gb.desktop/Main.module
+++ b/gb.desktop/src/gb.desktop/Main.module
@@ -23,7 +23,7 @@ Public Sub RunXdgUtil(sProg As String, aArg As String[])
       Try Mkdir sDir
       sCmd = sDir &/ sProg
       Copy "xdg-utils-1.0.2/scripts" &/ sProg To sCmd
-      Shell "chmod a+x " & Quote.Shell(sCmd)
+      Shell "chmod a+x " & Quote.Shell(sCmd) Wait
     Endif
     sCmd = Trim(sCmd)
     $cTool[sProg] = sCmd
diff --git a/gb.gtk/src/gpicturebox.cpp b/gb.gtk/src/gpicturebox.cpp
index 739fa89ea..a165c9479 100644
--- a/gb.gtk/src/gpicturebox.cpp
+++ b/gb.gtk/src/gpicturebox.cpp
@@ -259,21 +259,23 @@ int gPictureBox::alignment()
 
 void gPictureBox::setAlignment(int al)
 {
-	gfloat x,y;
+	gfloat x,y,xn;
 		
+	xn = gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL ? 1 : 0;
+	
 	switch (al)
 	{
 		case ALIGN_BOTTOM: 	y=1; 	x=0.5; break;
 		case ALIGN_BOTTOM_LEFT: 	y=1; 	x=0; break;
-		case ALIGN_BOTTOM_NORMAL: y=1; 	x=0; break;
+		case ALIGN_BOTTOM_NORMAL: y=1; 	x=xn; break;
 		case ALIGN_BOTTOM_RIGHT: 	y=1; 	x=1; break;
 		case ALIGN_CENTER: 	y=0.5; 	x=0.5; break;
 		case ALIGN_LEFT: 	y=0.5; 	x=0; break;
-		case ALIGN_NORMAL: 	y=0.5;  x=0; break;
+		case ALIGN_NORMAL: 	y=0.5;  x=xn; break;
 		case ALIGN_RIGHT: 	y=0.5; 	x=1; break;
 		case ALIGN_TOP: 		y=0; 	x=0.5; break;
 		case ALIGN_TOP_LEFT: 	y=0; 	x=0; break;
-		case ALIGN_TOP_NORMAL: 	y=0; 	x=0; break;
+		case ALIGN_TOP_NORMAL: 	y=0; 	x=xn; break;
 		case ALIGN_TOP_RIGHT: 	y=0; 	x=1; break;
 		default: return;
 	}
diff --git a/gb.qt/src/CPictureBox.cpp b/gb.qt/src/CPictureBox.cpp
index 81610a9b9..a6d12cfba 100644
--- a/gb.qt/src/CPictureBox.cpp
+++ b/gb.qt/src/CPictureBox.cpp
@@ -37,28 +37,16 @@
 #include "CPicture.h"
 #include "CPictureBox.h"
 
-/*#define DEBUG_CBUTTON*/
-
-#if 0
-MyLabel::MyLabel(QWidget *parent)
+MyPictureBox::MyPictureBox(QWidget *parent)
 : QLabel(parent)
 {
+  setWFlags(Qt::WNoAutoErase);
 }
 
-MyLabel::~MyLabel()
-{
-}
-
-
-void MyLabel::resizeEvent( QResizeEvent* e )
-{
-  QFrame::resizeEvent(e);
-}
-#endif
 
 BEGIN_METHOD(CPICTUREBOX_new, GB_OBJECT parent)
 
-  QLabel *wid = new QLabel(QCONTAINER(VARG(parent)));
+  MyPictureBox *wid = new MyPictureBox(QCONTAINER(VARG(parent)));
 
   THIS->picture = NULL;
 
diff --git a/gb.qt/src/CPictureBox.h b/gb.qt/src/CPictureBox.h
index fa142c093..fd791900b 100644
--- a/gb.qt/src/CPictureBox.h
+++ b/gb.qt/src/CPictureBox.h
@@ -36,9 +36,7 @@
 extern GB_DESC CPictureBoxDesc[];
 #else
 
-#define QLABEL(object) ((QLabel *)((CWIDGET *)object)->widget)
-
-#define WIDGET ((QLabel *)((CWIDGET *)_object)->widget)
+#define WIDGET ((MyPictureBox *)((CWIDGET *)_object)->widget)
 #define THIS ((CPICTUREBOX *)_object)
 
 #endif
@@ -50,21 +48,13 @@ typedef
     }
   CPICTUREBOX;
 
-/*
-class MyLabel : public QLabel
+class MyPictureBox : public QLabel
 {
   Q_OBJECT
 
 public:
 
-  MyLabel(QWidget *parent);
-  ~MyLabel();
-
-protected:
-
-  void resizeEvent( QResizeEvent* e );
+  MyPictureBox(QWidget *parent);
 };
-*/
-
 
 #endif
diff --git a/gb.qt/src/CWindow.cpp b/gb.qt/src/CWindow.cpp
index 88bfb884e..e7849538c 100644
--- a/gb.qt/src/CWindow.cpp
+++ b/gb.qt/src/CWindow.cpp
@@ -56,6 +56,24 @@
 
 #ifndef NO_X_WINDOW
 #include "x11.h"
+#else
+enum
+{
+	_NET_WM_WINDOW_TYPE_NORMAL,
+	_NET_WM_WINDOW_TYPE_DESKTOP,
+	_NET_WM_WINDOW_TYPE_DOCK,
+	_NET_WM_WINDOW_TYPE_TOOLBAR,
+	_NET_WM_WINDOW_TYPE_MENU,
+	_NET_WM_WINDOW_TYPE_UTILITY,
+	_NET_WM_WINDOW_TYPE_SPLASH,
+	_NET_WM_WINDOW_TYPE_DIALOG,
+	_NET_WM_WINDOW_TYPE_DROPDOWN_MENU,
+	_NET_WM_WINDOW_TYPE_POPUP_MENU,
+	_NET_WM_WINDOW_TYPE_TOOLTIP,
+	_NET_WM_WINDOW_TYPE_NOTIFICATION,
+	_NET_WM_WINDOW_TYPE_COMBO,
+	_NET_WM_WINDOW_TYPE_DND
+};
 #endif
 
 
@@ -1551,8 +1569,10 @@ void MyMainWindow::showActivate(QWidget *transient)
 		doReparent(newParentWidget, getWFlags(), pos());
 	}
 
+	#ifndef NO_X_WINDOW
 	if (THIS != CWINDOW_Main)
 		X11_set_transient_for(winId(), QWIDGET(CWINDOW_Main)->winId());
+	#endif
 
   //qDebug("showActivate %p", _object);
 
diff --git a/gb.qte/gb.qte.am b/gb.qte/gb.qte.am
index f3f5080f2..f7f395cc0 100644
--- a/gb.qte/gb.qte.am
+++ b/gb.qte/gb.qte.am
@@ -1,5 +1,4 @@
-CLEANFILES = moc_*.cpp
+CLEANFILES = *_moc.cpp
 
-moc_%.cpp: %.h
-	$(MOC) $< -o $@
- 
+.h_moc.cpp:
+	$(MOC) -o $@ $<
diff --git a/gb.qte/src/Makefile.am b/gb.qte/src/Makefile.am
index f317d8b9a..ef707586c 100644
--- a/gb.qte/src/Makefile.am
+++ b/gb.qte/src/Makefile.am
@@ -13,45 +13,46 @@ gb_qte_la_LDFLAGS = -module @LD_FLAGS@
 gb_qte_la_CXXFLAGS = -fno-rtti -DQWS -DGB_QT_COMPONENT $(AM_CXXFLAGS)
 
 gb_qte_la_SOURCES = \
- gb.qt.h main.h moc_main.cpp main.cpp \
+ gb.qt.h main.h main_moc.cpp main.cpp \
  CFont.h CFont.cpp \
  CScreen.h CScreen.cpp \
- CWidget.h moc_CWidget.cpp CWidget.cpp \
- CWindow.h moc_CWindow.cpp CWindow.cpp \
- CButton.h moc_CButton.cpp CButton.cpp \
- CContainer.h moc_CContainer.cpp CContainer.cpp \
- CLabel.h moc_CLabel.cpp CLabel.cpp \
- CListBox.h moc_CListBox.cpp CListBox.cpp \
- CTextBox.h moc_CTextBox.cpp CTextBox.cpp \
- CPictureBox.h moc_CPictureBox.cpp CPictureBox.cpp \
- CMenu.h moc_CMenu.cpp CMenu.cpp \
- CMouse.h moc_CMouse.cpp CMouse.cpp \
- CKey.h moc_CKey.cpp CKey.cpp \
- CColor.h moc_CColor.cpp CColor.cpp \
+ CWidget.h CWidget_moc.cpp CWidget.cpp \
+ CWindow.h CWindow_moc.cpp CWindow.cpp \
+ CButton.h CButton_moc.cpp CButton.cpp \
+ CContainer.h CContainer_moc.cpp CContainer.cpp \
+ CLabel.h CLabel_moc.cpp CLabel.cpp \
+ CListBox.h CListBox_moc.cpp CListBox.cpp \
+ CTextBox.h CTextBox_moc.cpp CTextBox.cpp \
+ CPictureBox.h CPictureBox_moc.cpp CPictureBox.cpp \
+ CMenu.h CMenu_moc.cpp CMenu.cpp \
+ CMouse.h CMouse_moc.cpp CMouse.cpp \
+ CKey.h CKey_moc.cpp CKey.cpp \
+ CColor.h CColor_moc.cpp CColor.cpp \
  CConst.h CConst.cpp \
- CCheckBox.h moc_CCheckBox.cpp CCheckBox.cpp \
- CFrame.h moc_CFrame.cpp CFrame.cpp \
- CPanel.h moc_CPanel.cpp CPanel.cpp \
- CRadioButton.h moc_CRadioButton.cpp CRadioButton.cpp \
- CTreeView.h moc_CTreeView.cpp CTreeView.cpp \
- CGridView.h moc_CGridView.cpp CGridView.cpp \
- CTextArea.h moc_CTextArea.cpp CTextArea.cpp \
- CTabStrip.h moc_CTabStrip.cpp CTabStrip.cpp \
- CDialog.h moc_CDialog.cpp CDialog.cpp \
- CPicture.h moc_CPicture.cpp CPicture.cpp \
- CImage.h moc_CImage.cpp CImage.cpp \
- CClipboard.h moc_CClipboard.cpp CClipboard.cpp \
+ CCheckBox.h CCheckBox_moc.cpp CCheckBox.cpp \
+ CFrame.h CFrame_moc.cpp CFrame.cpp \
+ CPanel.h CPanel_moc.cpp CPanel.cpp \
+ CRadioButton.h CRadioButton_moc.cpp CRadioButton.cpp \
+ CTreeView.h CTreeView_moc.cpp CTreeView.cpp \
+ CGridView.h CGridView_moc.cpp CGridView.cpp \
+ CTextArea.h CTextArea_moc.cpp CTextArea.cpp \
+ CTabStrip.h CTabStrip_moc.cpp CTabStrip.cpp \
+ CDialog.h CDialog_moc.cpp CDialog.cpp \
+ CPicture.h CPicture_moc.cpp CPicture.cpp \
+ CImage.h CImage_moc.cpp CImage.cpp \
+ CClipboard.h CClipboard_moc.cpp CClipboard.cpp \
  CDraw.h CDraw.cpp \
- CWatch.h moc_CWatch.cpp CWatch.cpp \
- CScrollView.h moc_CScrollView.cpp CScrollView.cpp \
- CDrawingArea.h moc_CDrawingArea.cpp CDrawingArea.cpp \
- CProgress.h moc_CProgress.cpp CProgress.cpp \
- CMessage.h moc_CMessage.cpp CMessage.cpp \
- CIconView.h moc_CIconView.cpp CIconView.cpp \
- CSlider.h moc_CSlider.cpp CSlider.cpp \
- CScrollBar.h moc_CScrollBar.cpp CScrollBar.cpp \
- CMovieBox.h moc_CMovieBox.cpp CMovieBox.cpp \
- CSpinBox.h moc_CSpinBox.cpp CSpinBox.cpp \
- CSplitter.h moc_CSplitter.cpp CSplitter.cpp \
- CWatcher.h moc_CWatcher.cpp CWatcher.cpp
- 
+ CWatch.h CWatch_moc.cpp CWatch.cpp \
+ CScrollView.h CScrollView_moc.cpp CScrollView.cpp \
+ CDrawingArea.h CDrawingArea_moc.cpp CDrawingArea.cpp \
+ CProgress.h CProgress_moc.cpp CProgress.cpp \
+ CMessage.h CMessage_moc.cpp CMessage.cpp \
+ CIconView.h CIconView_moc.cpp CIconView.cpp \
+ CSlider.h CSlider_moc.cpp CSlider.cpp \
+ CScrollBar.h CScrollBar_moc.cpp CScrollBar.cpp \
+ CMovieBox.h CMovieBox_moc.cpp CMovieBox.cpp \
+ CSpinBox.h CSpinBox_moc.cpp CSpinBox.cpp \
+ CEmbedder.h CEmbedder_moc.cpp CEmbedder.cpp \
+ CTrayIcon.h CTrayIcon_moc.cpp CTrayIcon.cpp \
+ CSplitter.h CSplitter_moc.cpp CSplitter.cpp \
+ CWatcher.h CWatcher_moc.cpp CWatcher.cpp
diff --git a/gb.qte/src/ext/Makefile.am b/gb.qte/src/ext/Makefile.am
index 1e2453b41..6c96a7cd2 100644
--- a/gb.qte/src/ext/Makefile.am
+++ b/gb.qte/src/ext/Makefile.am
@@ -12,14 +12,14 @@ gb_qte_ext_la_CXXFLAGS = -fno-rtti -DQWS -DGB_QT_COMPONENT $(AM_CXXFLAGS)
 
 gb_qte_ext_la_SOURCES = \
  main.h main.cpp \
- CLCDNumber.h moc_CLCDNumber.cpp CLCDNumber.cpp \
- CDial.h moc_CDial.cpp CDial.cpp \
+ CLCDNumber.h CLCDNumber_moc.cpp CLCDNumber.cpp \
+ CDial.h CDial_moc.cpp CDial.cpp \
  garray.h garray.cpp \
  gstring.h gstring.cpp \
  gdocument.h gdocument.cpp \
  gview.h moc_gview.cpp gview.cpp \
  CEditor.h moc_CEditor.cpp CEditor.cpp \
  CDraw.h CDraw.cpp \
- CDrawing.h moc_CDrawing.cpp CDrawing.cpp \
- CPrinter.h moc_CPrinter.cpp CPrinter.cpp \
- CTextEdit.h moc_CTextEdit.cpp CTextEdit.cpp
+ CDrawing.h CDrawing_moc.cpp CDrawing.cpp \
+ CPrinter.h CPrinter_moc.cpp CPrinter.cpp \
+ CTextEdit.h CTextEdit_moc.cpp CTextEdit.cpp