[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello

[Stephan Kulow]

SVN commit 576177 by coolo:

fixing ;(


 M  +1 -1      Makefile.am  
 M  +4 -2      docgenerators/Makefile.am  
 A             docgenerators/configure.in.in   branches/KDE/3.5/kdelibs/kdoctools/configure.in.in#576141


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/Makefile.am #576176:576177
@@ -115,7 +115,7 @@
 worktoolbar.cpp
 
 #umbrello_LDADD   = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
-umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_KDEPRINT) $(LIB_KIO) -lxslt -lxml2
+umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_KDEPRINT) $(LIB_KIO)
 
 ## See section "dnl Not GPL compatible" in ../configure.in.in
 # SUBDIRS = $(AUTOLAYOUT_DIR) codeimport dialogs clipboard pics codegenerators headings refactoring
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/docgenerators/Makefile.am #576176:576177
@@ -1,13 +1,15 @@
-INCLUDES = -I$(top_srcdir)/. -I$(top_srcdir)/umbrello -I$(top_srcdir)/umbrello/docgenerators -I../../../umbrello/umbrello -I/usr/include/libxml2 $(all_includes)
+INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/umbrello/docgenerators -I../../../umbrello/umbrello $(LIBXML_CFLAGS) $(all_includes)
 METASOURCES = AUTO
 bin_PROGRAMS = umbodoc
 
+AM_LDFLAGS = $(all_libraries)
 umbodoc_COMPILE_FIRST = version.h
 umbodoc_SOURCES = main.cpp
-umbodoc_LDADD = $(LIB_KDECORE) -lxslt -lxml2
+umbodoc_LDADD = $(LIB_KDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
 lib_LTLIBRARIES = libdocgenerators.la
 noinst_HEADERS = docbookgenerator.h version.h
 libdocgenerators_la_SOURCES = docbookgenerator.h docbookgenerator.cpp xhtmlgenerator.cpp
+libdocgenerators_la_LIBADD = $(LIB_KDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
 
 appdir=$(kde_datadir)/umbrello
 app_DATA = xmi2docbook.xsl docbook2xhtml.xsl xmi.css common.ent