dia r3890 - in trunk: . bindings doc/fr lib objects/Database objects/SISSI objects/custom_lines objects/standard

[hans svn gnome org]

Author: hans
Date: Sat Mar  1 21:25:35 2008
New Revision: 3890
URL: http://svn.gnome.org/viewvc/dia?rev=3890&view=rev

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

	* objects/custom_lines/custom_linetypes.c 
	  objects/custom_lines/Makefile.am : make the hack to include stuff
	from objects/standard pass 'make distcheck'. Looks very suspicous from 
	the design point of view. ObjectTypeOps are not meant to be reused.

	* objects/SISSI/Makefile.am objects/standard/Makefile.am
	  objects/Database/Makefile.am doc/fr/Makefile.am lib/newgroup.c :
	changes to make 'make distcheck' work ...
	* bindings/Makefile.am : ... almost ;)



Modified:
   trunk/ChangeLog
   trunk/bindings/Makefile.am
   trunk/doc/fr/Makefile.am
   trunk/lib/newgroup.c
   trunk/objects/Database/Makefile.am
   trunk/objects/SISSI/Makefile.am
   trunk/objects/custom_lines/Makefile.am
   trunk/objects/custom_lines/custom_linetypes.c
   trunk/objects/standard/Makefile.am

Modified: trunk/bindings/Makefile.am
==============================================================================
--- trunk/bindings/Makefile.am	(original)
+++ trunk/bindings/Makefile.am	Sat Mar  1 21:25:35 2008
@@ -1,9 +1,23 @@
 ## Process this file with automake to produce Makefile.in
 
-if WITH_SWIG
 libpython_bindings = _dia.la
+
+## without SWIG we wont have/build this
+## but to avoid bit-rotting we build the rest
+if WITH_SWIG
+BUILT_SOURCES = \
+	dia-python.cpp
+endif
+
+## needs just Python
+if WITH_PYTHON
+PYTHON_EXTRA_SOURCE = \
+	dia-python-extra.cpp \
+	dia-python-extra.h
 endif
 
+## the rest of the sources is independent of SWIG and Python
+
 # the python part (import dia;)
 pkgpython_PYTHON = dia.py
 pkgpyexec_LTLIBRARIES = $(libpython_bindings)
@@ -24,14 +38,14 @@
 	dia-extra.cpp \
 	dia-extra.h \
 	\
-	dia-python-extra.cpp \
-	dia-python-extra.h \
+	$(PYTHON_EXTRA_SOURCE) \
 	\
-	dia-python.cpp
+	$(BUILT_SOURCES)
 
 _dia_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/lib
-_dia_la_LDFLAGS = -export-dynamic -module
+_dia_la_LDFLAGS = -export-dynamic -module -avoid-version
 _dia_la_LIBADD = ../lib/libdia.la $(PYTHON_LIBS) $(GTK_LIBS)
+
 INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
@@ -39,9 +53,6 @@
 	$(PYTHON_INCLUDES) \
 	$(XML_CFLAGS) $(UNICODE_CFLAGS) 
 
-BUILT_SOURCES = \
-	dia-python.cpp
-
 # called INTERFACES in makefile.msc, what swig processes
 INTERFACES = \
 	dia.swig \

Modified: trunk/doc/fr/Makefile.am
==============================================================================
--- trunk/doc/fr/Makefile.am	(original)
+++ trunk/doc/fr/Makefile.am	Sat Mar  1 21:25:35 2008
@@ -36,8 +36,9 @@
 	graphics/home_network.png \
 	graphics/line_icon.png \
 	graphics/greendots.png \
-	graphics/color_selector.png \
-	graphics/preferences-fig.png
+	graphics/color_selector.png
+
+##missing	graphics/preferences-fig.png
 
 if HAVE_DB2MAN
 # Anyone out there who understands automake?

Modified: trunk/lib/newgroup.c
==============================================================================
--- trunk/lib/newgroup.c	(original)
+++ trunk/lib/newgroup.c	Sat Mar  1 21:25:35 2008
@@ -36,7 +36,7 @@
 #include "parent.h"
 #include "newgroup.h"
 
-#include "objects/Misc/pixmaps/newgroup.xpm"
+#include "../objects/Misc/pixmaps/newgroup.xpm"
 
 #define NUM_CONNECTIONS 9
 

Modified: trunk/objects/Database/Makefile.am
==============================================================================
--- trunk/objects/Database/Makefile.am	(original)
+++ trunk/objects/Database/Makefile.am	Sat Mar  1 21:25:35 2008
@@ -2,11 +2,12 @@
 
 pkglib_LTLIBRARIES = 	libdb_objects.la
 libdb_objects_la_SOURCES = \
-			database.c \
-			table.c \
-			table_dialog.c \
-			reference.c \
-			compound.c
+	database.c \
+	database.h \
+	table.c \
+	table_dialog.c \
+	reference.c \
+	compound.c
 
 libdb_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 

Modified: trunk/objects/SISSI/Makefile.am
==============================================================================
--- trunk/objects/SISSI/Makefile.am	(original)
+++ trunk/objects/SISSI/Makefile.am	Sat Mar  1 21:25:35 2008
@@ -2,15 +2,22 @@
 
 pkglib_LTLIBRARIES = 	libsissi_objects.la
 libsissi_objects_la_SOURCES = \
-			menace.c\
-			sissi_dialog.c \
-			sissi.h \
-			sissi.c \
-			sissi_object.c \
-			faraday.c \
-			room.c\
-			site.c\
-			area.c
+	menace.c \
+	menace.h \
+	sissi_dialog.c \
+	sissi_dialog.h \
+	sissi.c \
+	sissi.h \
+	sissi_object.c \
+	sissi_object.h \
+	faraday.c \
+	faraday.h \
+	room.c \
+	room.h \
+	site.c \
+	site.h \
+	area.c \
+	area.h
 
 libsissi_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
@@ -19,4 +26,6 @@
 EXTRA_DIST = \
 	pixmaps/sissi_object.xpm \
 	pixmaps/faraday.png  \
-	pixmaps/broken.xpm
+	pixmaps/broken.xpm \
+	methode_attack.h \
+	classification.h

Modified: trunk/objects/custom_lines/Makefile.am
==============================================================================
--- trunk/objects/custom_lines/Makefile.am	(original)
+++ trunk/objects/custom_lines/Makefile.am	Sat Mar  1 21:25:35 2008
@@ -2,14 +2,22 @@
 
 pkglib_LTLIBRARIES = 	libcustom_lines_objects.la
 libcustom_lines_objects_la_SOURCES = \
-			custom_lines.c  \
-			custom_linetypes.c  \
-			line_info.c
+	custom_lines.c \
+	custom_linetypes.c \
+	custom_linetypes.h \
+	line_info.c \
+	line_info.h
 
 libcustom_lines_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 libcustom_lines_objects_la_LIBADD = ../standard/libstandard_objects.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
+# including objects/standard is plain wrong but needed for 'make distcheck'!
+# the second include is to trick it to work with srcdir!=buildir, at least I think so;)
+INCLUDES = \
+	-I$(srcdir)/../../lib \
+	-I$(srcdir)/../../objects/standard \
+	-I$(srcdir)/../../../objects/standard \
+	$(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
 	pixmaps/default.xpm 

Modified: trunk/objects/custom_lines/custom_linetypes.c
==============================================================================
--- trunk/objects/custom_lines/custom_linetypes.c	(original)
+++ trunk/objects/custom_lines/custom_linetypes.c	Sat Mar  1 21:25:35 2008
@@ -31,9 +31,13 @@
 
 #include "object.h"
 
-#include "../standard/polyline.h"
-#include "../standard/zigzagline.h"
-#include "../standard/bezier.h"
+/* Including stuff from objects/standard is violating plug-in independence 
+ * and requires extra hoops in Makefile.am. This thing is not going to work
+ * on win32 at all. Need to think about the proper solution ...
+ */
+#include "polyline.h"
+#include "zigzagline.h"
+#include "bezier.h"
 
 #include "line_info.h"
 #include "custom_linetypes.h"

Modified: trunk/objects/standard/Makefile.am
==============================================================================
--- trunk/objects/standard/Makefile.am	(original)
+++ trunk/objects/standard/Makefile.am	Sat Mar  1 21:25:35 2008
@@ -1,19 +1,23 @@
 ## Process this file with automake to produce Makefile.in
 pkglib_LTLIBRARIES = 	libstandard_objects.la
-libstandard_objects_la_SOURCES = 	arc.c \
-			box.c \
-			ellipse.c \
-			textobj.c \
-			line.c \
-			zigzagline.c \
-			polyline.c \
-			bezier.c \
-			standard.c \
-			image.c \
-			outline.c \
-			polygon.c \
-			beziergon.c \
-			tool-icons.h
+libstandard_objects_la_SOURCES = 	
+	arc.c \
+	box.c \
+	ellipse.c \
+	textobj.c \
+	line.c \
+	zigzagline.c \
+	zigzagline.h \
+	polyline.c \
+	polyline.h \
+	bezier.c \
+	bezier.h \
+	standard.c \
+	image.c \
+	outline.c \
+	polygon.c \
+	beziergon.c \
+	tool-icons.h
 
 libstandard_objects_la_LDFLAGS = -export-dynamic -module -avoid-version