dia r4190 - in trunk: . objects/FS po

[hans svn gnome org]

Author: hans
Date: Sun Jan 11 20:09:58 2009
New Revision: 4190
URL: http://svn.gnome.org/viewvc/dia?rev=4190&view=rev

Log:
2009-01-11  Hans Breuer  <hans breuer org>

	[make "make distcheck" work again]
	* objects/FS/flow-poly.c : obsolete, finally removed
	* po/POTFILES.in : added app/create_object.c
	* po/POTFILES.skip : added some *.py to stop complains
	* configure.in : default is no doc creation ...
	* hardcopies.make : ... and thus not touching read-only directories.
	Lowers the priority of bug #567385




Removed:
   trunk/objects/FS/flow-poly.c
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/hardcopies.make
   trunk/objects/FS/Makefile.am
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan 11 20:09:58 2009
@@ -219,7 +219,7 @@
 AC_CHECK_LIB(EMF, CreateEnhMetaFileWithFILEW, , emf_ok=no, -lstdc++)
 if test "$emf_ok" = yes; then
   LIBEMF_CFLAGS='-I /usr/include/libEMF'
-  LIBEMF_LIBS='-lEMF'
+  LIBEMF_LIBS='-lEMF -lstdc++'
   AC_DEFINE(HAVE_LIBEMF,1,[libEMF library available])
 fi
 AC_SUBST(LIBEMF_CFLAGS)
@@ -472,11 +472,9 @@
 dnl html, pdf and postscript documentation
 dnl
 AC_ARG_WITH(hardbooks,
-[  --with-hardbooks	compile html, pdf and postscript documentation],,hardbooks=no)
+[  --with-hardbooks	compile html, pdf and postscript documentation],,with_hardbooks=no)
 AC_PATH_PROG(DBLATEX,dblatex,no)
-AM_CONDITIONAL(WITH_HTMLDOC, test "x$xsltproc" != "xno")
-AM_CONDITIONAL(WITH_PDFDOC, test "x$dblatex" != "xno")
-AM_CONDITIONAL(WITH_PSDOC, test "x$dblatex" != "xno")
+
 dnl
 dnl use jw only if we don't find dblatex
 dnl
@@ -488,12 +486,15 @@
 fi
 hardbook_ok=no
 xsltproc_ok=no
-if test "x$hardbooks" == "xno"; then
+if test "x$with_hardbooks" == "xno"; then
   AM_CONDITIONAL(WITH_JW, test "xno" != "xno")
   AM_CONDITIONAL(WITH_HTMLDOC, test "xno" != "xno")
   AM_CONDITIONAL(WITH_PDFDOC, test "xno" != "xno")
   AM_CONDITIONAL(WITH_PSDOC, test "xno" != "xno")
 else
+  AM_CONDITIONAL(WITH_HTMLDOC, test "x$xsltproc" != "xno")
+  AM_CONDITIONAL(WITH_PDFDOC, test "x$dblatex" != "xno")
+  AM_CONDITIONAL(WITH_PSDOC, test "x$dblatex" != "xno")
   if test "x$dblatex" != "xno" ; then
     hardbook_ok=yes
   else 

Modified: trunk/hardcopies.make
==============================================================================
--- trunk/hardcopies.make	(original)
+++ trunk/hardcopies.make	Sun Jan 11 20:09:58 2009
@@ -17,8 +17,11 @@
 
 if WITH_HTMLDOC
 htmldoc = $(progname)_html
+html_install_data = install-data-html
 html_install = install-html
+html_install_ng = install-html-nognome
 html_uninstall = uninstall-html
+html_uninstall_ng = uninstall-html-nognome
 html_clean = clean-html
 endif
 
@@ -46,7 +49,7 @@
 	$(html_install) $(pdf_install) $(ps_install) install-examples
 
 uninstall-local: uninstall-local-xml  \
-	uninstall-html uninstall-pdf uninstall-ps uninstall-examples
+	$(html_install) uninstall-pdf uninstall-ps uninstall-examples
 
 clean-local: clean-local-xml \
 	clean-html clean-ps clean-pdf
@@ -54,10 +57,10 @@
 else
  
 if HAVE_XSLTPROC
-all: $(progname)_html $(pdfdoc) $(psdoc)
+all: $(htmldoc) $(pdfdoc) $(psdoc)
 
-install-data-local: install-data-html \
-	install-html-nognome $(pdf_install) $(ps_install) install-examples
+install-data-local: $(html_install_data) \
+	$(html_install_ng) $(pdf_install) $(ps_install) install-examples
  
 uninstall-local: uninstall-local-html  \
 	uninstall-html-nognome uninstall-pdf uninstall-ps uninstall-examples
@@ -141,7 +144,7 @@
 	cp jw/$(progname).pdf .
 endif
 
-install-html: $(progname)_html
+install-html: $(htmldoc)
 	$(mkinstalldirs) $(sysdoc_html)
 	cp -r $(srcdir)/$(progname)_html/* $(sysdoc_html)
 
@@ -169,7 +172,7 @@
 	-rm -rf $(srcdir)/$(progname)_html
 
 
-install-pdf: $(progname).pdf
+install-pdf: $(pdfdoc)
 	$(mkinstalldirs) $(sysdoc_pdf)
 	-$(INSTALL_DATA) $< $(sysdoc_pdf)/$<
 
@@ -210,3 +213,4 @@
 	  rm -f $(sysdoc)/examples/$$(basename $$i) ;\
 	done
 	-rmdir $(sysdoc)/examples
+

Modified: trunk/objects/FS/Makefile.am
==============================================================================
--- trunk/objects/FS/Makefile.am	(original)
+++ trunk/objects/FS/Makefile.am	Sun Jan 11 20:09:58 2009
@@ -15,5 +15,4 @@
 EXTRA_DIST = \
 	pixmaps/flow.xpm \
 	pixmaps/function.xpm \
-	pixmaps/orthflow.xpm \
-	flow-poly.c # This file seems to be unused and dead for ages !
+	pixmaps/orthflow.xpm

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sun Jan 11 20:09:58 2009
@@ -4,6 +4,7 @@
 app/autosave.c
 app/color_area.c
 app/commands.c
+app/create_object.c
 app/defaults.c
 app/dia-props.c
 app/dia_embedd.c

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Sun Jan 11 20:09:58 2009
@@ -1,5 +1,10 @@
 dia.desktop.in
-objects/FS/flow-poly.c
-objects/sybase/sybase.c
 sheets/EML.sheet.in
+po-checktrans.py
+plug-ins/python/otypes.py
+plug-ins/python/autolayoutforce.py
+plug-ins/python/gtkcons.py
+plug-ins/python/aobjects.py
+plug-ins/python/diasvg.py
+plug-ins/python/doxrev.py