dia r3894 - in trunk: . bindings data doc/en doc/fr objects/standard po

[hans svn gnome org]

Author: hans
Date: Tue Mar  4 15:09:29 2008
New Revision: 3894
URL: http://svn.gnome.org/viewvc/dia?rev=3894&view=rev

Log:
2008-03-04  Hans Breuer  <hans breuer org>

	* objects/standard/Makefile.am : ooops, was not built anymore;)gedit 

	[autobreak trial and error - finally makes 'make distcheck' pass]
	* bindings/Makefile.am : dont try to install anything
	* data/Makefile.am : add dia-splash.png to EXTRA_DIST
	* doc/en/Makefile.am : add dia-dbk-to-chapter.sed to EXTRA_DIST
	* xmldocs.make : s/docdir/helpdocdir/
	* po/POTFILES.(in|skip) : updated



Modified:
   trunk/ChangeLog
   trunk/bindings/Makefile.am
   trunk/data/Makefile.am
   trunk/doc/en/Makefile.am
   trunk/doc/fr/Makefile.am
   trunk/objects/standard/Makefile.am
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip
   trunk/xmldocs.make

Modified: trunk/bindings/Makefile.am
==============================================================================
--- trunk/bindings/Makefile.am	(original)
+++ trunk/bindings/Makefile.am	Tue Mar  4 15:09:29 2008
@@ -18,9 +18,16 @@
 
 ## the rest of the sources is independent of SWIG and Python
 
+## nothing to be installed yet
+if WITH_SWIG
+## this is not working yet (link error)
+pkgpyexec_LTLIBRARIES = $(libpython_bindings)
 # the python part (import dia;)
 pkgpython_PYTHON = dia.py
-pkgpyexec_LTLIBRARIES = $(libpython_bindings)
+else
+noinst_LTLIBRARIES = $(libpython_bindings)
+pkgpython_PYTHON = 
+endif
 
 # c++ wrapper over Dia's C api
 _dia_la_SOURCES = \
@@ -44,7 +51,8 @@
 
 _dia_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/lib
 _dia_la_LDFLAGS = -export-dynamic -module -avoid-version
-_dia_la_LIBADD = ../lib/libdia.la $(PYTHON_LIBS) $(GTK_LIBS)
+## must link ../lib/libdia.la but don't know how;(
+_dia_la_LIBADD = $(PYTHON_LIBS) $(GTK_LIBS)
 
 INCLUDES = \
 	-I$(top_srcdir) \
@@ -67,7 +75,10 @@
 $(srcdir)/dia-python.cpp : $(INTERFACES)
 	$(SWIG) $(SWIG_PYTHON_OPT) -I$(top_srcdir) -I../lib -o $@ $<
 
+
 EXTRA_DIST = \
+	dia.swig \
 	makefile.msc \
+	Doxyfile \
 	test.py
 

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Tue Mar  4 15:09:29 2008
@@ -12,4 +12,5 @@
 	integrated-ui.xml
 
 EXTRA_DIST = \
-	$(ui_DATA)
+	$(ui_DATA) \
+	$(pkgdata_DATA)

Modified: trunk/doc/en/Makefile.am
==============================================================================
--- trunk/doc/en/Makefile.am	(original)
+++ trunk/doc/en/Makefile.am	Tue Mar  4 15:09:29 2008
@@ -31,24 +31,29 @@
 
 
 EXTRA_DIST += \
-	dia.dbk
+	dia.dbk \
+	dia-dbk-to-chapter.sed
 #	graphics/line_props.png \
 #	graphics/home_network.png \
 #	graphics/line_icon.png \
 #	graphics/greendots.png
 
+DISTCLEANFILES = dia-cmdline.xml
+
 if HAVE_DB2MAN
 # Anyone out there who understands automake?
-DISTCLEANFILES = dia.1
+DISTCLEANFILES += dia.1
 # If we want misconfigured XML catalogs to not try net access, use
 # --nonet.  But I don't think that's going to solve more problems
 # than it causes.
 dia.1: dia.dbk
 	xsltproc --novalid $(DB2MAN) $< >dia.1
-endif
 
 man_MANS = dia.1
+endif
 
 #outputs and filter dia.dbk into documentation chapter
 include-cmdline: dia.dbk
-	sed -f dia-dbk-to-chapter.sed $< >dia-cmdline.xml
+	sed -f $(srcdir)/dia-dbk-to-chapter.sed $< >dia-cmdline.xml
+
+

Modified: trunk/doc/fr/Makefile.am
==============================================================================
--- trunk/doc/fr/Makefile.am	(original)
+++ trunk/doc/fr/Makefile.am	Tue Mar  4 15:09:29 2008
@@ -32,6 +32,7 @@
 
 EXTRA_DIST += \
 	dia.dbk \
+	dia-dbk-to-chapter.sed \
 	graphics/line_props.png \
 	graphics/home_network.png \
 	graphics/line_icon.png \
@@ -40,22 +41,25 @@
 
 ##missing	graphics/preferences-fig.png
 
+DISTCLEANFILES = dia-cmdline.xml
+
 if HAVE_DB2MAN
 # Anyone out there who understands automake?
-DISTCLEANFILES = dia.1
+DISTCLEANFILES += dia.1
 # If we want misconfigured XML catalogs to not try net access, use
 # --nonet.  But I don't think that's going to solve more problems
 # than it causes.
 dia.1: dia.dbk
 	xsltproc --novalid $(DB2MAN) $< >dia.1
-endif
 
 man_MANS = dia.1
+endif
 
 #adding lang to man path
 mandir = $(datadir)/man/$(lang)
 
 #outputs and filter dia.dbk into documentation chapter
 include-cmdline: dia.dbk
-	sed -f dia-dbk-to-chapter.sed $< >dia-cmdline.xml
+	sed -f $(srcdir)/dia-dbk-to-chapter.sed $< >dia-cmdline.xml
+
 

Modified: trunk/objects/standard/Makefile.am
==============================================================================
--- trunk/objects/standard/Makefile.am	(original)
+++ trunk/objects/standard/Makefile.am	Tue Mar  4 15:09:29 2008
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 pkglib_LTLIBRARIES = 	libstandard_objects.la
-libstandard_objects_la_SOURCES = 	
+libstandard_objects_la_SOURCES = \	
 	arc.c \
 	box.c \
 	ellipse.c \

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue Mar  4 15:09:29 2008
@@ -154,6 +154,8 @@
 objects/chronogram/chronoref.c
 objects/custom/custom.c
 objects/custom/custom_object.c
+objects/custom_lines/custom_lines.c
+objects/custom_lines/custom_linetypes.c
 objects/custom/shape_info.c
 objects/flowchart/box.c
 objects/flowchart/diamond.c

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Tue Mar  4 15:09:29 2008
@@ -1,3 +1,4 @@
+dia.desktop.in
 objects/EML/eml.c
 objects/EML/instantiation.c
 objects/EML/interaction-ortho.c

Modified: trunk/xmldocs.make
==============================================================================
--- trunk/xmldocs.make	(original)
+++ trunk/xmldocs.make	Tue Mar  4 15:09:29 2008
@@ -34,12 +34,12 @@
 
 
 # **********  Begin of section some packagers may need to modify  **********
-# This variable (docdir) specifies where the documents should be installed.
+# This variable (helpdocdir) specifies where the documents should be installed.
 # This default value should work for most packages.
 if HAVE_GNOME
-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+helpdocdir = $(datadir)/gnome/help/$(docname)/$(lang)
 else
-docdir = $(datadir)/$(docname)/help/$(lang)
+helpdocdir = $(datadir)/$(docname)/help/$(lang)
 endif
 
 # **********  You should not have to edit below this line  **********
@@ -67,15 +67,15 @@
 	fi
 
 install-data-local: omf
-	$(mkinstalldirs) $(DESTDIR)$(docdir)
+	$(mkinstalldirs) $(DESTDIR)$(helpdocdir)
 	for file in $(xml_files); do \
-	  cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
+	  cp $(srcdir)/$$file $(DESTDIR)$(helpdocdir); \
 	done
 	if test "$(figdir)"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
+	  $(mkinstalldirs) $(DESTDIR)$(helpdocdir)/$(figdir); \
 	  for file in $(srcdir)/$(figdir)/*.png; do \
 	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
+	    $(INSTALL_DATA) $$file $(DESTDIR)$(helpdocdir)/$(figdir)/$$basefile; \
 	  done \
 	fi
 
@@ -87,13 +87,13 @@
 	-if test "$(figdir)"; then \
 	  for file in $(srcdir)/$(figdir)/*.png; do \
 	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
+	    rm -f $(DESTDIR)$(helpdocdir)/$(figdir)/$$basefile; \
 	  done; \
-	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
+	  rmdir $(DESTDIR)$(helpdocdir)/$(figdir); \
 	fi
 	-for file in $(xml_files); do \
-	  rm -f $(DESTDIR)$(docdir)/$$file; \
+	  rm -f $(DESTDIR)$(helpdocdir)/$$file; \
 	done
-	-rmdir $(DESTDIR)$(docdir)
+	-rmdir $(DESTDIR)$(helpdocdir)
 
 clean-local: clean-local-omf