Re: Clean up make distclean



tor, 20,.04.2006 kl. 09.53 +0100, skrev Matt Davey:
> I don't mean to be smart, here, but it would be great if you could
> supply a patch for these improvements.  Like any open-source contributor
> I've met, I've a pretty limited amount of time I can spend on gp.

I can understand how you can't (and don't want to) spend lots of time
digging into minor problems. I'm no autotool wizzie myself, so it took
some time to figure out something useful. I've attached two patches that
are quite simple and easy to understand. The first one is a one-liner
and solves a double copy when doing "make install-data-local". The other
one cleans up generated files and makes "make distcheck" run
successfully.

> As David Desrosiers mentioned, there are other serious problems with the
> tarball distribution centred on the libtool stuff (the --with-pisock=
> path doesn't get added to the libtool search path).  And conduits never
> seem to work before a 'make install' either.  This is stuff that'd be
> great to fix, but I don't see myself getting around to right now.

I might have a chance to look at some other problems, but need to use
g-p a bit more first and get a hang of the main structure of the code.

> p.s. any feedback good or bad on the pre-release?

I was pestered with gslice hangs in Debian to begin with, but that seems
to be more or less solved now. Otherwise it works very well, although I
have only tested with "classic" config (Evolution+Serial+Palm m505).

There is another wish when it comes to the build process.
gpilot-install-file, gpilotd-control-applet, gpilot-applet and gpilotd
are being compiled with -rpath. Is it possible to get rid of that?

Cheers,
Øystein
Index: help/C/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/help/C/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- help/C/Makefile.am	2 May 2003 16:03:09 -0000	1.2
+++ help/C/Makefile.am	21 Apr 2006 11:22:03 -0000
@@ -1,7 +1,6 @@
 docname = gnome-pilot
 lang = C
 omffile = gnome-pilot-C.omf
-entities = gnome-pilot.xml
 
 include $(top_srcdir)/help/xmldocs.make
 dist-hook: app-dist-hook
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- Makefile.am	18 Apr 2006 18:01:43 -0000	1.38
+++ Makefile.am	21 Apr 2006 11:30:33 -0000
@@ -33,6 +33,10 @@
 	intltool-extract.in	\
 	intltool-update.in	\
 	intltool-merge.in	\
-	gnome-pilot.spec 	\
+	gnome-pilot.spec.in 	\
 	gnome-pilot-2.0.pc.in
 
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+
+# Let 'make distcheck' ignore database created by scrollkeeper-update
+distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
Index: applet/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/applet/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- applet/Makefile.am	27 Mar 2005 04:31:35 -0000	1.38
+++ applet/Makefile.am	21 Apr 2006 11:30:33 -0000
@@ -80,3 +80,4 @@
 	$(schemas_in_files)		\
 	$(NULL)
 
+CLEANFILES = $(server_DATA) $(server_in_files:.server.in.in=.server.in) $(schemas_DATA)
Index: capplet/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/capplet/Makefile.am,v
retrieving revision 1.52
diff -u -r1.52 Makefile.am
--- capplet/Makefile.am	9 Apr 2006 11:40:41 -0000	1.52
+++ capplet/Makefile.am	21 Apr 2006 11:30:33 -0000
@@ -61,3 +61,5 @@
 	$(appicon_DATA)			\
 	$(glade_DATA) 			\
 	$(NULL)
+
+CLEANFILES = $(desktop_DATA)
Index: conduits/file/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/conduits/file/Makefile.am,v
retrieving revision 1.34
diff -u -r1.34 Makefile.am
--- conduits/file/Makefile.am	10 Aug 2005 13:12:22 -0000	1.34
+++ conduits/file/Makefile.am	21 Apr 2006 11:30:33 -0000
@@ -46,7 +46,7 @@
 
 man_MANS=gpilot-install-file.1
 
-CLEANFILES = $(Conduit_DATA)
+CLEANFILES = $(Conduit_DATA) $(Mime_DATA)
 
 EXTRA_DIST = 			\
 	file.conduit.in		\
Index: gpilotd/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/gpilotd/Makefile.am,v
retrieving revision 1.91
diff -u -r1.91 Makefile.am
--- gpilotd/Makefile.am	4 Apr 2005 22:49:38 -0000	1.91
+++ gpilotd/Makefile.am	21 Apr 2006 11:30:34 -0000
@@ -96,9 +96,6 @@
 
 BUILT_SOURCES = $(CORBA_SRCLIST) $(GOB_BUILT_SRCS) gpmarshal.c gpmarshal.h
 
-CLEANFILES = $(CORBA_SRCLIST)
-MAINTAINERCLEANFILES = $(GOB_BUILT_SRCS)
-
 ## LIBGPILOTD
 
 libgpilotd_la_SOURCES = 		\
@@ -208,3 +205,6 @@
 
 dist-hook:
 	cd $(distdir); rm -rf $(CORBA_SRCLIST)
+
+CLEANFILES = $(CORBA_SRCLIST) $(server_DATA) $(server_in_files:.server.in.in=.server.in)
+MAINTAINERCLEANFILES = $(GOB_BUILT_SRCS)
Index: help/xmldocs.make
===================================================================
RCS file: /cvs/gnome/gnome-pilot/help/xmldocs.make,v
retrieving revision 1.1
diff -u -r1.1 xmldocs.make
--- help/xmldocs.make	2 May 2003 15:32:46 -0000	1.1
+++ help/xmldocs.make	21 Apr 2006 11:30:34 -0000
@@ -43,7 +43,7 @@
 xml_files = $(entities) $(docname).xml
 
 EXTRA_DIST = $(xml_files) $(omffile)
-CLEANFILES = omf_timestamp
+CLEANFILES = omf_timestamp $(omffile).out
 
 # If the following file is in a subdir (like help/) you need to add that to the path
 include $(top_srcdir)/help/omf.make

Attachment: signature.asc
Description: Dette er en digitalt signert meldingsdel



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]