GNOME.org
 

Re: moving headers for libcapplet, libapplets, libdocklets

Richard Hestilow <hestilow ximian com> writes:
> That sounds great. I am almost ready to commit a fix to cvs HEAD to:
> 

Yikes, I have a big-ass patch to HEAD as well. ;-) I'm sure we have
conflicts galore.

It doesn't totally work yet, but I'll append so you can see what I've
done. (ignore po/Changelog diff ;-) Basically the Makefiles were kind
of a mess and I moved to pkg-config and added the proper flags to
build against libcapplet2.  I also have the patch to libcapplet HEAD
which makes it put headers in libcapplet2.

> Temporarily, for the sake of developers:
> * install binaries outside the user's PATH, specifically in
> $libdir/capplet/capplets. Otherwise, the capplet binaries will conflict
> with each other.
> * install capplet desktop files in $libdir/capplet/desktop, for similar
> reasons.
> * install launcher desktop files in a new, seperate subdir
> * modify gnomecc to look for these desktop and binary files in the
> correct location
> * rename the gnomecc binary to "gnomecc2"

OK, definitely temporary though. There's no need to allow two versions
of the desktop installed at once. ;-)

> * have control-center check for the devel version of libcapplet

I just did this, by making libcapplet use pkg-config and query for
"libcapplet2" - I have a .pc.in file added to libcapplet.

> With your header fix, the only problem I can think of is that, unlike
> pkgconfig, the .conf files can only exist for one version of a library.
> We can modify the name, but should we do it on HEAD or your end?

I removed cappletConf.sh from libcapplet HEAD, I think we should just
get rid of it and use pkg-config.

Do you want to commit first and have me sort it out, or do you want
me to commit and let you sort it out?

I'm happy to do the sorting out if you want to commit your stuff.

Of course first we probably need Bradford or Jacob to approve my patch
here (once I fix the dangling bits).

Havoc

Index: configure.in
===================================================================
RCS file: /cvs/gnome/control-center/configure.in,v
retrieving revision 1.194
diff -u -p -u -r1.194 configure.in
--- configure.in	2001/05/05 14:18:57	1.194
+++ configure.in	2001/06/20 23:46:13
@@ -12,7 +12,7 @@ gnome_cv_use_gnome=yes
 
 
 AM_ACLOCAL_INCLUDE(macros)
-GNOME_INIT(capplet)
+GNOME_INIT
 GNOME_COMPILE_WARNINGS
 
 AC_ISC_POSIX
@@ -78,22 +78,6 @@ AC_MSG_ERROR([Fatal Error: no Imlib dete
 CFLAGS="-O2 -g -Wall $CFLAGS"
 
 dnl
-dnl CApplet, Note that the libs and all that is set up in gnome_init,
-dnl but gnome_init is truly dumb and doesn't require it, so we need to
-dnl do a separate check
-dnl
-AC_MSG_CHECKING(for capplet library)
-vers=`$GNOME_CONFIG --modversion capplet`
-case "x$vers" in
-  xcapplet-*)
-    AC_MSG_RESULT(found)
-    ;;
-  *)
-    AC_MSG_ERROR(Did not find capplet library, you probably need to install libcapplet first)
-    ;;
-esac
-
-dnl
 dnl Check for libximian_archiver and set the flag
 dnl HAVE_LIBXIMIAN_ARCHIVER iff it is prsent
 dnl
@@ -102,44 +86,29 @@ vers=`$GNOME_CONFIG --modversion ximian_
 case "x$vers" in
   xximian-archiver-*)
     AC_DEFINE(HAVE_XIMIAN_ARCHIVER)
-    ARCHIVER_CFLAGS=`gnome-config --cflags ximian_archiver`
-    ARCHIVER_LIBS=`gnome-config --libs ximian_archiver`
+    ARCHIVER_MODULE=ximian_archiver
     AC_MSG_RESULT(found)
     ;;
   *)
     AC_MSG_RESULT(not found)
     ;;
 esac
-
-CAPPLET_CFLAGS="`gnome-config --cflags libglade capplet gdk_pixbuf` $ARCHIVER_CFLAGS"
-CAPPLET_LIBS="`gnome-config --libs libglade capplet gdk_pixbuf` $ARCHIVER_LIBS"
-
-BG_CAPPLET_CFLAGS="`gnome-config --cflags libglade capplet gdk_pixbuf gdk_pixbuf_xlib` $ARCHIVER_CFLAGS"
-BG_CAPPLET_LIBS="`gnome-config --libs libglade capplet gdk_pixbuf gdk_pixbuf_xlib` $ARCHIVER_LIBS"
-
-ROLLBACK_CAPPLET_CFLAGS="`gnome-config --cflags libglade capplet gdk_pixbuf` $ARCHIVER_CFLAGS"
-ROLLBACK_CAPPLET_LIBS="`gnome-config --libs libglade capplet gdk_pixbuf` $ARCHIVER_LIBS"
-
-GNOMECC_CFLAGS=`gnome-config --cflags gnomeui libglade xml gdk_pixbuf capplet gnomecanvaspixbuf gtkhtml`
-GNOMECC_LIBS=`gnome-config --libs gnomeui libglade xml gdk_pixbuf capplet gnomecanvaspixbuf gtkhtml`
-
-RMHELPER_CFLAGS=`gnome-config --cflags gnomeui gnomecanvaspixbuf`
-RMHELPER_LIBS=`gnome-config --libs gnomeui gnomecanvaspixbuf`
-
-AC_SUBST(CAPPLET_CFLAGS)
-AC_SUBST(CAPPLET_LIBS)
-
-AC_SUBST(BG_CAPPLET_CFLAGS)
-AC_SUBST(BG_CAPPLET_LIBS)
 
-AC_SUBST(ROLLBACK_CAPPLET_CFLAGS)
-AC_SUBST(ROLLBACK_CAPPLET_LIBS)
+capplet_modules="libcapplet2 libglade gdk_pixbuf $ARCHIVER_MODULE"
 
-AC_SUBST(GNOMECC_CFLAGS)
-AC_SUBST(GNOMECC_LIBS)
+PKG_CHECK_MODULES(CAPPLET, $capplet_modules)
+PKG_CHECK_MODULES(BG_CAPPLET, $capplet_modules gdk_pixbuf_xlib)
+PKG_CHECK_MODULES(ROLLBACK_CAPPLET, $capplet_modules)
+PKG_CHECK_MODULES(VFS_CAPPLET, $capplet_modules)
+PKG_CHECK_MODULES(GNOMECC, gnomeui libglade xml gdk_pixbuf capplet gnomecanvaspixbuf gtkhtml)
+PKG_CHECK_MODULES(RMHELPER, gnomeui gnomecanvaspixbuf)
+
+dnl gnome-vfs doesn't support gnome-config or pkg-config
+VFS_CFLAGS=`gnome-vfs-config --cflags`
+VFS_LIBS=`gnome-vfs-config --libs`
 
-AC_SUBST(RMHELPER_CFLAGS)
-AC_SUBST(RMHELPER_LIBS)
+VFS_CAPPLET_CFLAGS="$VFS_CAPPLET_CFLAGS $VFS_CFLAGS"
+VFS_CAPPLET_LIBS="$VFS_CAPPLET_LIBS $VFS_LIBS"
 
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
Index: capplets/file-types/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/file-types/Makefile.am,v
retrieving revision 1.22
diff -u -p -u -r1.22 Makefile.am
--- capplets/file-types/Makefile.am	2001/03/06 23:33:18	1.22
+++ capplets/file-types/Makefile.am	2001/06/20 23:46:13
@@ -7,13 +7,10 @@ INCLUDES = -I. 						\
 	-I$(srcdir) 					\
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
 	-I$(top_srcdir)/libgnomevfs			\
-	$(CAPPLET_INCLUDEDIR)				\
-	$(OAF_CFLAGS)					\
-	$(GNOME_INCLUDEDIR)				\
-	$(GTK_CFLAGS)					\
+	@VFS_CAPPLET_CFLAGS@				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(includedir)					\
-	$(VFS_CFLAGS) $(WERROR)				\
+	$(WERROR)					\
 	$(NULL)
 
 
@@ -30,10 +27,7 @@ file_types_capplet_SOURCES =			\
 
 
 file_types_capplet_LDADD =						\
-			$(CAPPLET_LIBDIR) 				\
-			$(CAPPLET_LIBS) 				\
-			$(ORBIT_LIBS) 					\
-			$(OAF_LIBS)					\
+			@VFS_CAPPLET_LIBS@				\
 			$(INTLLIBS) 					\
 			$(top_builddir)/libgnomevfs/libgnomevfs.la 	\
 			-lgdk_pixbuf					\
Index: capplets/gnome-edit-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/gnome-edit-properties/Makefile.am,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile.am
--- capplets/gnome-edit-properties/Makefile.am	2000/12/26 19:56:50	1.9
+++ capplets/gnome-edit-properties/Makefile.am	2001/06/20 23:46:13
@@ -1,14 +1,14 @@
 INCLUDES = -I. -I$(srcdir) 				\
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	$(CAPPLET_CFLAGS)
+	@CAPPLET_CFLAGS@
 	-DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
 
 bin_PROGRAMS = gnome-edit-properties-capplet
 
 gnome_edit_properties_capplet_SOURCES = gnome-edit-properties.c
 
-gnome_edit_properties_capplet_LDADD = $(CAPPLET_LIBS)
+gnome_edit_properties_capplet_LDADD = @CAPPLET_LIBS@
 
 EXTRA_DIST = \
 	gnome-edit-properties.desktop
Index: capplets/mime-type/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/mime-type/Makefile.am,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile.am
--- capplets/mime-type/Makefile.am	2000/12/26 19:56:53	1.8
+++ capplets/mime-type/Makefile.am	2001/06/20 23:46:13
@@ -1,7 +1,7 @@
 INCLUDES = -I. -I$(srcdir) 				\
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	$(CAPPLET_CFLAGS)
+	@CAPPLET_CFLAGS@
 
 bin_PROGRAMS = mime-type-capplet
 
@@ -10,7 +10,7 @@ mime_type_capplet_SOURCES = mime-type-ca
 	edit-window.h mime-info.c mime-info.h \
 	new-mime-window.h new-mime-window.c
 
-mime_type_capplet_LDADD = $(CAPPLET_LIBS)
+mime_type_capplet_LDADD = @CAPPLET_LIBS@
 
 EXTRA_DIST = \
 	mime-type.desktop
Index: capplets/new-background-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/new-background-properties/Makefile.am,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile.am
--- capplets/new-background-properties/Makefile.am	2000/12/26 19:41:23	1.5
+++ capplets/new-background-properties/Makefile.am	2001/06/20 23:46:13
@@ -20,8 +20,7 @@ INCLUDES = \
 	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"	\
 	-DG_LOG_DOMAIN=\"background-properties\"	\
 	-DGLADE_DATADIR=\""$(Gladedir)"\"		\
-	$(GNOME_INCLUDEDIR)				\
-	$(BG_CAPPLET_CFLAGS)				\
+	@BG_CAPPLET_CFLAGS@				\
 	-I$(top_srcdir)/				\
 	-I$(top_srcdir)/intl
 
@@ -34,4 +33,4 @@ background_properties_capplet_SOURCES = 
 	main.c
 
 background_properties_capplet_LDADD = \
-	$(GNOME_LIBDIR)	$(BG_CAPPLET_LIBS)
+	@BG_CAPPLET_LIBS@
Index: capplets/new-bell-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/new-bell-properties/Makefile.am,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile.am
--- capplets/new-bell-properties/Makefile.am	2000/12/26 19:41:24	1.5
+++ capplets/new-bell-properties/Makefile.am	2001/06/20 23:46:13
@@ -20,8 +20,7 @@ INCLUDES = \
 	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"	\
 	-DG_LOG_DOMAIN=\"bell-properties\"	\
 	-DGLADE_DATADIR=\""$(Gladedir)"\"		\
-	$(GNOME_INCLUDEDIR)				\
-	$(CAPPLET_CFLAGS)				\
+	@CAPPLET_CFLAGS@				\
 	-I$(top_srcdir)/				\
 	-I$(top_srcdir)/intl				
 
@@ -32,4 +31,4 @@ bell_properties_capplet_SOURCES = \
 	preferences.c preferences.h \
 	main.c
 
-bell_properties_capplet_LDADD = $(CAPPLET_LIBS)
+bell_properties_capplet_LDADD = @CAPPLET_LIBS@
Index: capplets/new-keyboard-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/new-keyboard-properties/Makefile.am,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile.am
--- capplets/new-keyboard-properties/Makefile.am	2000/12/26 19:41:25	1.4
+++ capplets/new-keyboard-properties/Makefile.am	2001/06/20 23:46:13
@@ -20,7 +20,7 @@ INCLUDES = \
 	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"	\
 	-DG_LOG_DOMAIN=\"keyboard-properties\"		\
 	-DGLADE_DATADIR=\""$(Gladedir)"\"		\
-	$(CAPPLET_CFLAGS)				\
+	@CAPPLET_CFLAGS@				\
 	-I$(top_srcdir)/				\
 	-I$(top_srcdir)/intl				
 
@@ -31,4 +31,4 @@ keyboard_properties_SOURCES = \
 	preferences.c preferences.h \
 	main.c
 
-keyboard_properties_LDADD = $(CAPPLET_LIBS) $(XF86MISC_LIBS)
+keyboard_properties_LDADD = @CAPPLET_LIBS@ $(XF86MISC_LIBS)
Index: capplets/new-mouse-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/new-mouse-properties/Makefile.am,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile.am
--- capplets/new-mouse-properties/Makefile.am	2000/12/26 19:41:26	1.5
+++ capplets/new-mouse-properties/Makefile.am	2001/06/20 23:46:13
@@ -20,8 +20,7 @@ INCLUDES = \
 	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"	\
 	-DG_LOG_DOMAIN=\"mouse-properties\"		\
 	-DGLADE_DATADIR=\""$(Gladedir)"\"		\
-	$(GNOME_INCLUDEDIR)				\
-	$(CAPPLET_CFLAGS)				\
+	@CAPPLET_CFLAGS@				\
 	-I$(top_srcdir)/				\
 	-I$(top_srcdir)/intl
 
@@ -33,5 +32,4 @@ mouse_properties_capplet_SOURCES = \
 	main.c
 
 mouse_properties_capplet_LDADD = \
-	$(GNOME_LIBDIR)	\
-	$(CAPPLET_LIBS)
+	@CAPPLET_LIBS@
Index: capplets/new-screensaver-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/new-screensaver-properties/Makefile.am,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile.am
--- capplets/new-screensaver-properties/Makefile.am	2000/12/26 19:41:26	1.6
+++ capplets/new-screensaver-properties/Makefile.am	2001/06/20 23:46:13
@@ -20,7 +20,7 @@ INCLUDES = \
 	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
 	-DSSPROP_DATADIR=\""${prefix}/share"\" \
 	-DG_LOG_DOMAIN=\"screensaver-properties\" \
-	$(CAPPLET_CFLAGS) \
+	@CAPPLET_CFLAGS@ \
 	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/intl
 
@@ -40,4 +40,4 @@ screensaver_properties_capplet_SOURCES =
 	XScreenSaver_ad.h \
 	main.c
 
-screensaver_properties_capplet_LDADD = $(CAPPLET_LIBS) -lXt
+screensaver_properties_capplet_LDADD = @CAPPLET_LIBS@ -lXt
Index: capplets/new-sound-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/new-sound-properties/Makefile.am,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile.am
--- capplets/new-sound-properties/Makefile.am	2000/12/26 19:41:27	1.4
+++ capplets/new-sound-properties/Makefile.am	2001/06/20 23:46:13
@@ -20,7 +20,7 @@ INCLUDES = \
 	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"	\
 	-DG_LOG_DOMAIN=\"sound-properties\"		\
 	-DGLADE_DATADIR=\""$(Gladedir)"\"		\
-	$(CAPPLET_CFLAGS)				\
+	@CAPPLET_CFLAGS@				\
 	-I$(top_srcdir)/				\
 	-I$(top_srcdir)/intl
 
@@ -31,4 +31,4 @@ sound_properties_capplet_SOURCES = \
 	preferences.c preferences.h \
 	main.c
 
-sound_properties_capplet_LDADD = $(CAPPLET_LIBS)
+sound_properties_capplet_LDADD = @CAPPLET_LIBS@
Index: capplets/new-ui-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/new-ui-properties/Makefile.am,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile.am
--- capplets/new-ui-properties/Makefile.am	2000/12/29 19:54:00	1.6
+++ capplets/new-ui-properties/Makefile.am	2001/06/20 23:46:13
@@ -19,7 +19,7 @@ INCLUDES = \
 	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"	\
 	-DG_LOG_DOMAIN=\"ui-properties\"		\
 	-DGLADE_DATADIR=\""$(Gladedir)"\"		\
-	$(CAPPLET_CFLAGS)				\
+	@CAPPLET_CFLAGS@				\
 	-I$(top_srcdir)/				\
 	-I$(top_srcdir)/intl				
 
@@ -30,4 +30,4 @@ ui_properties_capplet_SOURCES = \
 	preferences.c preferences.h \
 	main.c
 
-ui_properties_capplet_LDADD = $(CAPPLET_LIBS)
+ui_properties_capplet_LDADD = @CAPPLET_LIBS@
Index: capplets/rollback/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/rollback/Makefile.am,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile.am
--- capplets/rollback/Makefile.am	2001/01/29 22:41:53	1.3
+++ capplets/rollback/Makefile.am	2001/06/20 23:46:13
@@ -20,8 +20,7 @@ INCLUDES = \
 	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"	\
 	-DG_LOG_DOMAIN=\"background-properties\"	\
 	-DGLADE_DATADIR=\""$(Gladedir)"\"		\
-	$(GNOME_INCLUDEDIR)				\
-	$(ROLLBACK_CAPPLET_CFLAGS)			\
+	@ROLLBACK_CAPPLET_CFLAGS@			\
 	-I$(top_srcdir)/				\
 	-I$(top_srcdir)/intl
 
@@ -34,4 +33,4 @@ rollback_capplet_SOURCES = \
 	main.c
 
 rollback_capplet_LDADD = \
-	$(GNOME_LIBDIR)	$(ROLLBACK_CAPPLET_LIBS)
+	@ROLLBACK_CAPPLET_LIBS@
Index: capplets/theme-switcher/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/theme-switcher/Makefile.am,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile.am
--- capplets/theme-switcher/Makefile.am	2000/12/26 19:41:29	1.11
+++ capplets/theme-switcher/Makefile.am	2001/06/20 23:46:13
@@ -2,7 +2,7 @@ INCLUDES = -I. -I$(srcdir) 				\
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
 	-I$(srcdir)/../../libcapplet		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	$(CAPPLET_CFLAGS)
+	@CAPPLET_CFLAGS@
 
 bin_PROGRAMS = theme-selector-capplet
 
@@ -17,7 +17,7 @@ theme_selector_capplet_SOURCES = \
 	gui.c           \
 	install.c
 
-theme_selector_capplet_LDADD = $(CAPPLET_LIBS)
+theme_selector_capplet_LDADD = @CAPPLET_LIBS@
 
 EXTRA_DIST = \
 	theme-selector.desktop
Index: capplets/ui-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/ui-properties/Makefile.am,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile.am
--- capplets/ui-properties/Makefile.am	2000/08/11 19:17:25	1.10
+++ capplets/ui-properties/Makefile.am	2001/06/20 23:46:13
@@ -2,7 +2,7 @@ INCLUDES = -I. -I$(srcdir) 				\
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
 	-I$(srcdir)/../../libcapplet		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-I$(includedir) $(GNOME_INCLUDEDIR)		\
+	-I$(includedir) @CAPPLET_CFLAGS@		\
 	-DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
 
 bin_PROGRAMS = ui-properties
@@ -10,8 +10,7 @@ bin_PROGRAMS = ui-properties
 ui_properties_SOURCES = ui-properties.c
 
 ui_properties_LDADD = ../../libcapplet/libcapplet.la \
-		     $(GNOME_LIBS) $(ORBIT_LIBS) \
-		     $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(INTLLIBS)
+			@CAPPLET_LIBS@ $(INTLLIBS)
 
 
 EXTRA_DIST = \
Index: capplets/url-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/url-properties/Makefile.am,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile.am
--- capplets/url-properties/Makefile.am	2000/12/26 19:41:31	1.8
+++ capplets/url-properties/Makefile.am	2001/06/20 23:46:13
@@ -2,14 +2,14 @@ INCLUDES = -I. -I$(srcdir) 				\
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
 	-I$(srcdir)/../../libcapplet		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	$(CAPPLET_CFLAGS)				\
+	@CAPPLET_CFLAGS@				\
 	-DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
 
 bin_PROGRAMS = url-properties
 
 url_properties_SOURCES = url-properties.c
 
-url_properties_LDADD = $(CAPPLET_LIBS)
+url_properties_LDADD = @CAPPLET_LIBS@
 
 EXTRA_DIST = \
 	url-properties.desktop
Index: capplets/wm-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/capplets/wm-properties/Makefile.am,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile.am
--- capplets/wm-properties/Makefile.am	2000/12/26 19:41:31	1.7
+++ capplets/wm-properties/Makefile.am	2001/06/20 23:46:13
@@ -1,7 +1,7 @@
 INCLUDES = -I. -I$(srcdir) 				\
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	$(CAPPLET_CFLAGS)
+	@CAPPLET_CFLAGS@
 
 bin_PROGRAMS = wm-properties-capplet
 
@@ -12,7 +12,7 @@ wm_properties_capplet_SOURCES = \
 	wm-list.c                \
 	wm-exec.c
 
-wm_properties_capplet_LDADD = $(CAPPLET_LIBS)
+wm_properties_capplet_LDADD = @CAPPLET_LIBS@
 
 EXTRA_DIST = wm-properties.desktop 
 
Index: new-control-center/Makefile.am
===================================================================
RCS file: /cvs/gnome/control-center/new-control-center/Makefile.am,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile.am
--- new-control-center/Makefile.am	2001/01/25 01:00:30	1.11
+++ new-control-center/Makefile.am	2001/06/20 23:46:13
@@ -32,7 +32,7 @@ INCLUDES = 						\
 	-DPIXMAPS_DIR=\""$(appicondir)"\"		\
 	-DART_DIR=\""$(splashdir)"\"			\
 	-DGNOME_SBINDIR=\""$(sbindir)"\"		\
-	$(GNOMECC_CFLAGS)
+	@GNOMECC_CFLAGS@
 
 bin_PROGRAMS = gnomecc
 
@@ -46,7 +46,7 @@ gnomecc_SOURCES = \
 	capplet-dir-view-list.c
 
 gnomecc_LDADD = \
-	$(GNOMECC_LIBS)					\
+	@GNOMECC_LIBS@					\
 	$(INTLLIBS)
 
 EXTRA_DIST = gnomecc.desktop $(appicon_DATA) $(splash_DATA) $(glade_DATA)
Index: po/ChangeLog
===================================================================
RCS file: /cvs/gnome/control-center/po/ChangeLog,v
retrieving revision 1.251
diff -u -p -u -r1.251 ChangeLog
--- po/ChangeLog	2001/06/07 01:21:11	1.251
+++ po/ChangeLog	2001/06/20 23:46:13
@@ -1,3 +1,67 @@
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
 2001-06-07  Christian Rose  <menthos menthos com>
 
 	* POTFILES.in: Added missing file.


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libcapplet/ChangeLog,v
retrieving revision 1.289
diff -u -p -u -r1.289 ChangeLog
--- ChangeLog	2001/05/29 23:49:38	1.289
+++ ChangeLog	2001/06/20 23:49:01
@@ -1,3 +1,8 @@
+2001-06-20  Havoc Pennington  <hp redhat com>
+
+	* configure.in (ALL_LINGUAS): disable zh_TW.Big5 because new
+	gettext claims it has corrupt text
+
 2001-05-05  Bradford Hovinen  <hovinen ximian com>
 
 	* libcapplet/Makefile.am (INCLUDES): Add LIBCAPPLET_CFLAGS
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/libcapplet/Makefile.am,v
retrieving revision 1.34
diff -u -p -u -r1.34 Makefile.am
--- Makefile.am	2000/12/26 18:06:50	1.34
+++ Makefile.am	2001/06/20 23:49:01
@@ -1 +1,4 @@
 SUBDIRS = intl idl libcapplet po
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA=libcapplet2.pc
Index: configure.in
===================================================================
RCS file: /cvs/gnome/libcapplet/configure.in,v
retrieving revision 1.190
diff -u -p -u -r1.190 configure.in
--- configure.in	2001/05/29 23:49:38	1.190
+++ configure.in	2001/06/20 23:49:01
@@ -26,7 +26,7 @@ AC_PROG_YACC
 dnl utility conditional
 AM_CONDITIONAL(FALSE, test "x" = "y")
 
-ALL_LINGUAS="az ca cs da de el en_GB es et fi fr ga gl hr hu it ja ko lt nl no pl pt pt_BR ro ru sk sl sv tr uk zh_CN.GB2312 zh_TW.Big5"
+ALL_LINGUAS="az ca cs da de el en_GB es et fi fr ga gl hr hu it ja ko lt nl no pl pt pt_BR ro ru sk sl sv tr uk zh_CN.GB2312"
 AM_GNOME_GETTEXT
 
 AC_CHECK_HEADERS(dlfcn.h dl.h)
@@ -50,6 +50,7 @@ AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 
 AC_OUTPUT([
+libcapplet2.pc
 Makefile
 po/Makefile.in
 libcapplet/Makefile
Index: libcapplet2.pc.in
===================================================================
RCS file: libcapplet2.pc.in
diff -N libcapplet2.pc.in
--- /dev/null	Tue May  5 16:32:27 1998
+++ libcapplet2.pc.in	Wed Jun 20 19:49:01 2001
@@ -0,0 +1,11 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+Name: libcapplet
+Description: Capplet library
+Version: @VERSION@
+Requires: gnomeui gnorba
+Libs: -L${libdir} -lcapplet
+Cflags: -I${includedir}/libcapplet2
Index: libcapplet/Makefile.am
===================================================================
RCS file: /cvs/gnome/libcapplet/libcapplet/Makefile.am,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile.am
--- libcapplet/Makefile.am	2001/05/29 23:49:38	1.5
+++ libcapplet/Makefile.am	2001/06/20 23:49:01
@@ -1,6 +1,3 @@
-confexecdir = $(libdir)
-confexec_DATA = cappletConf.sh
-
 INCLUDES = 			\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
@@ -14,19 +11,6 @@ lib_LTLIBRARIES = libcapplet.la
 
 libcapplet_la_SOURCES = \
 	capplet-widget.c
-
-include_HEADERS = capplet-widget.h
-
-EXTRA_DIST = cappletConf.sh.in
 
-#
-# Create the cappletConf.sh file from the sh.in file
-#
-cappletConf.sh: cappletConf.sh.in Makefile
-	sed -e 's?\ GNOME_LIBDIR\@?-L$(libdir) $(GNOME_LIBDIR)?g' \
-	    -e 's?\ GNOMEUI_LIBS\@?$(GNOMEUI_LIBS)?g' \
-	    -e 's?\ GNOME_INCLUDEDIR\@?-I$(includedir) $(GNOME_INCLUDEDIR)?g' \
-	    -e 's?\ ORB_LIBS\@?$(ORB_LIBS)?g' \
-	    -e 's?\ VERSION\@?$(VERSION)?g' \
-	    < $(srcdir)/cappletConf.sh.in > cappletConf.tmp \
-	  && mv cappletConf.tmp cappletConf.sh
+libcappletincludedir=$(includedir)/libcapplet2
+libcappletinclude_HEADERS = capplet-widget.h
Index: libcapplet/cappletConf.sh.in
===================================================================
RCS file: cappletConf.sh.in
diff -N cappletConf.sh.in
--- /tmp/cvsueRcWg	Wed Jun 20 19:49:02 2001
+++ /dev/null	Tue May  5 16:32:27 1998
@@ -1,4 +0,0 @@
-CAPPLET_LIBDIR="@GNOME_LIBDIR@"
-CAPPLET_LIBS="-lcapplet @GNOMEUI_LIBS@ @ORB_LIBS@ -lgnorba"
-CAPPLET_INCLUDEDIR="@GNOME_INCLUDEDIR@"
-MODULE_VERSION="capplet- VERSION@"
\ No newline at end of file
Index: po/ChangeLog
===================================================================
RCS file: /cvs/gnome/libcapplet/po/ChangeLog,v
retrieving revision 1.207
diff -u -p -u -r1.207 ChangeLog
--- po/ChangeLog	2000/12/21 09:09:39	1.207
+++ po/ChangeLog	2001/06/20 23:49:01
@@ -1,3 +1,23 @@
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
+2001-06-20  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.37.
+
 2000-12-21  Valek Filippov  <frob df ru>
 
 	* ru.po: updated russian translation.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]