[Uml-devel] kdesdk/umbrello/umbrello

[Dirk Mueller]

CVS commit by mueller: 

unbreak compilation


  M +2 -4      Makefile.am   1.37
  M +1 -1      main.cpp   1.12


--- kdesdk/umbrello/umbrello/Makefile.am  #1.36:1.37
@@ -1,4 +1,5 @@
 bin_PROGRAMS = umbrello
 
+umbrello_COMPILE_FIRST = version.h
 umbrello_SOURCES = activitywidget.cpp actor.cpp actorwidget.cpp \
         artifact.cpp artifactwidget.cpp \
@@ -61,8 +62,5 @@
 
 version.h: $(top_srcdir)/umbrello/VERSION
-        printf "#undef VERSION\n#define VERSION \"`cat $(top_srcdir)/umbrello/VERSION`\"\n" > version.h
+        printf "#undef UMBRELLO_VERSION\n#define UMBRELLO_VERSION \"`cat $(top_srcdir)/umbrello/VERSION`\"\n" > version.h
 
 noinst_HEADERS = version.h
-
-main.o: version.h
-

--- kdesdk/umbrello/umbrello/main.cpp  #1.11:1.12
@@ -35,5 +35,5 @@ int main(int argc, char *argv[]) {
 
         KAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"),
-                              VERSION, description, KAboutData::License_GPL,
+                              UMBRELLO_VERSION, description, KAboutData::License_GPL,
                               I18N_NOOP("(c) 2001 Paul Hensgen, (c) 2002 Umbrello UML Modeller Authors"), 0,
                               "http://uml.sf.net/");