[Uml-devel] kdesdk/umbrello

[Stephan Kulow]

CVS commit by coolo: 

compile


  M +1 -20     Makefile.am   1.4
  M +1 -0      umbrello/codegenerator.h   1.10


--- kdesdk/umbrello/Makefile.am  #1.3:1.4
@@ -8,24 +8,5 @@
 AUTOMAKE_OPTIONS = foreign 
 
-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
-        cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
-
-$(top_srcdir)/subdirs:
-        cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
-        @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
-
-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
-
-package-messages:
-        $(MAKE) -f admin/Makefile.common package-messages
-        $(MAKE) -C po merge
-
-dist-hook:
-        cd $(top_distdir) && perl admin/am_edit -padmin
-        cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
-
-AM_CPPFLAGS = @QT_INCLUDES@
+AM_CPPFLAGS = $(QT_INCLUDES)
 VERSION:=`cat ${PWD}/VERSION`
 

--- kdesdk/umbrello/umbrello/codegenerator.h  #1.9:1.10
@@ -25,4 +25,5 @@
 #include <qstringlist.h>
 #include <qobject.h>
+#include <kinstance.h>
 
 class UMLDoc;