applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch to using pkg-config to find things

Browse source 
2001-06-21  Havoc Pennington  <hp@redhat.com>

	* configure.in: switch to using pkg-config to find things

	* capplets/*/Makefile.am: clean up crufty flags, adapt to
	configure.in changes
This commit is contained in:
Havoc Pennington 2001-06-21 16:09:21 +00:00 • committed by Havoc Pennington
parent c894d8e52b
commit 22c09dbb52
15 changed files with 48 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2001-06-21 Havoc Pennington <hp@redhat.com>
* configure.in: switch to using pkg-config to find things
* capplets/*/Makefile.am: clean up crufty flags, adapt to
configure.in changes
2001-06-21 Bradford Hovinen <hovinen@ximian.com> 2001-06-21 Bradford Hovinen <hovinen@ximian.com>
* capplets/new-*/main.c (main): Abort if prefs structure is NULL * capplets/new-*/main.c (main): Abort if prefs structure is NULL

5
capplets/background/Makefile.am
View file

@ -20,8 +20,7 @@ INCLUDES = \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"background-properties\" \ -DG_LOG_DOMAIN=\"background-properties\" \
-DGLADE_DATADIR=\""$(Gladedir)"\" \ -DGLADE_DATADIR=\""$(Gladedir)"\" \
$(GNOME_INCLUDEDIR) \ @BG_CAPPLET_CFLAGS@ \
$(BG_CAPPLET_CFLAGS) \
-I$(top_srcdir)/ \ -I$(top_srcdir)/ \
-I$(top_srcdir)/intl -I$(top_srcdir)/intl
@ -34,4 +33,4 @@ background_properties_capplet_SOURCES = \
main.c main.c
background_properties_capplet_LDADD = \ background_properties_capplet_LDADD = \
$(GNOME_LIBDIR) $(BG_CAPPLET_LIBS) @BG_CAPPLET_LIBS@

12
capplets/file-types/Makefile.am
View file

@ -7,13 +7,10 @@ INCLUDES = -I. \
-I$(srcdir) \ -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(top_srcdir)/libgnomevfs \ -I$(top_srcdir)/libgnomevfs \
$(CAPPLET_INCLUDEDIR) \ @VFS_CAPPLET_CFLAGS@ \
$(OAF_CFLAGS) \
$(GNOME_INCLUDEDIR) \
$(GTK_CFLAGS) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-I$(includedir) \ -I$(includedir) \
$(VFS_CFLAGS) $(WERROR) \ $(WERROR) \
$(NULL) $(NULL)
@ -30,10 +27,7 @@ file_types_capplet_SOURCES = \
file_types_capplet_LDADD = \ file_types_capplet_LDADD = \
$(CAPPLET_LIBDIR) \ @VFS_CAPPLET_LIBS@ \
$(CAPPLET_LIBS) \
$(ORBIT_LIBS) \
$(OAF_LIBS) \
$(INTLLIBS) \ $(INTLLIBS) \
$(top_builddir)/libgnomevfs/libgnomevfs.la \ $(top_builddir)/libgnomevfs/libgnomevfs.la \
-lgdk_pixbuf \ -lgdk_pixbuf \

4
capplets/keyboard/Makefile.am
View file

@ -20,7 +20,7 @@ INCLUDES = \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"keyboard-properties\" \ -DG_LOG_DOMAIN=\"keyboard-properties\" \
-DGLADE_DATADIR=\""$(Gladedir)"\" \ -DGLADE_DATADIR=\""$(Gladedir)"\" \
$(CAPPLET_CFLAGS) \ @CAPPLET_CFLAGS@ \
-I$(top_srcdir)/ \ -I$(top_srcdir)/ \
-I$(top_srcdir)/intl -I$(top_srcdir)/intl
@ -31,4 +31,4 @@ keyboard_properties_SOURCES = \
preferences.c preferences.h \ preferences.c preferences.h \
main.c main.c
keyboard_properties_LDADD = $(CAPPLET_LIBS) $(XF86MISC_LIBS) keyboard_properties_LDADD = @CAPPLET_LIBS@ $(XF86MISC_LIBS)

4
capplets/mime-type/Makefile.am
View file

@ -1,7 +1,7 @@
INCLUDES = -I. -I$(srcdir) \ INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(CAPPLET_CFLAGS) @CAPPLET_CFLAGS@
bin_PROGRAMS = mime-type-capplet bin_PROGRAMS = mime-type-capplet
@ -10,7 +10,7 @@ mime_type_capplet_SOURCES = mime-type-capplet.c\
edit-window.h mime-info.c mime-info.h \ edit-window.h mime-info.c mime-info.h \
new-mime-window.h new-mime-window.c new-mime-window.h new-mime-window.c
mime_type_capplet_LDADD = $(CAPPLET_LIBS) mime_type_capplet_LDADD = @CAPPLET_LIBS@
EXTRA_DIST = \ EXTRA_DIST = \
mime-type.desktop mime-type.desktop

6
capplets/mouse/Makefile.am
View file

@ -20,8 +20,7 @@ INCLUDES = \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"mouse-properties\" \ -DG_LOG_DOMAIN=\"mouse-properties\" \
-DGLADE_DATADIR=\""$(Gladedir)"\" \ -DGLADE_DATADIR=\""$(Gladedir)"\" \
$(GNOME_INCLUDEDIR) \ @CAPPLET_CFLAGS@ \
$(CAPPLET_CFLAGS) \
-I$(top_srcdir)/ \ -I$(top_srcdir)/ \
-I$(top_srcdir)/intl -I$(top_srcdir)/intl
@ -33,5 +32,4 @@ mouse_properties_capplet_SOURCES = \
main.c main.c
mouse_properties_capplet_LDADD = \ mouse_properties_capplet_LDADD = \
$(GNOME_LIBDIR) \ @CAPPLET_LIBS@
$(CAPPLET_LIBS)

5
capplets/rollback/Makefile.am
View file

@ -20,8 +20,7 @@ INCLUDES = \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"background-properties\" \ -DG_LOG_DOMAIN=\"background-properties\" \
-DGLADE_DATADIR=\""$(Gladedir)"\" \ -DGLADE_DATADIR=\""$(Gladedir)"\" \
$(GNOME_INCLUDEDIR) \ @ROLLBACK_CAPPLET_CFLAGS@ \
$(ROLLBACK_CAPPLET_CFLAGS) \
-I$(top_srcdir)/ \ -I$(top_srcdir)/ \
-I$(top_srcdir)/intl -I$(top_srcdir)/intl
@ -34,4 +33,4 @@ rollback_capplet_SOURCES = \
main.c main.c
rollback_capplet_LDADD = \ rollback_capplet_LDADD = \
$(GNOME_LIBDIR) $(ROLLBACK_CAPPLET_LIBS) @ROLLBACK_CAPPLET_LIBS@

4
capplets/screensaver/Makefile.am
View file

@ -20,7 +20,7 @@ INCLUDES = \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DSSPROP_DATADIR=\""${prefix}/share"\" \ -DSSPROP_DATADIR=\""${prefix}/share"\" \
-DG_LOG_DOMAIN=\"screensaver-properties\" \ -DG_LOG_DOMAIN=\"screensaver-properties\" \
$(CAPPLET_CFLAGS) \ @CAPPLET_CFLAGS@ \
-I$(top_srcdir)/ \ -I$(top_srcdir)/ \
-I$(top_srcdir)/intl -I$(top_srcdir)/intl
@ -40,4 +40,4 @@ screensaver_properties_capplet_SOURCES = \
XScreenSaver_ad.h \ XScreenSaver_ad.h \
main.c main.c
screensaver_properties_capplet_LDADD = $(CAPPLET_LIBS) -lXt screensaver_properties_capplet_LDADD = @CAPPLET_LIBS@ -lXt

4
capplets/sound/Makefile.am
View file

@ -20,7 +20,7 @@ INCLUDES = \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"sound-properties\" \ -DG_LOG_DOMAIN=\"sound-properties\" \
-DGLADE_DATADIR=\""$(Gladedir)"\" \ -DGLADE_DATADIR=\""$(Gladedir)"\" \
$(CAPPLET_CFLAGS) \ @CAPPLET_CFLAGS@ \
-I$(top_srcdir)/ \ -I$(top_srcdir)/ \
-I$(top_srcdir)/intl -I$(top_srcdir)/intl
@ -31,4 +31,4 @@ sound_properties_capplet_SOURCES = \
preferences.c preferences.h \ preferences.c preferences.h \
main.c main.c
sound_properties_capplet_LDADD = $(CAPPLET_LIBS) sound_properties_capplet_LDADD = @CAPPLET_LIBS@

4
capplets/theme-switcher/Makefile.am
View file

@ -2,7 +2,7 @@ INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../libcapplet \ -I$(srcdir)/../../libcapplet \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(CAPPLET_CFLAGS) @CAPPLET_CFLAGS@
bin_PROGRAMS = theme-selector-capplet bin_PROGRAMS = theme-selector-capplet
@ -17,7 +17,7 @@ theme_selector_capplet_SOURCES = \
gui.c \ gui.c \
install.c install.c
theme_selector_capplet_LDADD = $(CAPPLET_LIBS) theme_selector_capplet_LDADD = @CAPPLET_LIBS@
EXTRA_DIST = \ EXTRA_DIST = \
theme-selector.desktop theme-selector.desktop

4
capplets/ui-properties/Makefile.am
View file

@ -19,7 +19,7 @@ INCLUDES = \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"ui-properties\" \ -DG_LOG_DOMAIN=\"ui-properties\" \
-DGLADE_DATADIR=\""$(Gladedir)"\" \ -DGLADE_DATADIR=\""$(Gladedir)"\" \
$(CAPPLET_CFLAGS) \ @CAPPLET_CFLAGS@ \
-I$(top_srcdir)/ \ -I$(top_srcdir)/ \
-I$(top_srcdir)/intl -I$(top_srcdir)/intl
@ -30,4 +30,4 @@ ui_properties_capplet_SOURCES = \
preferences.c preferences.h \ preferences.c preferences.h \
main.c main.c
ui_properties_capplet_LDADD = $(CAPPLET_LIBS) ui_properties_capplet_LDADD = @CAPPLET_LIBS@

4
capplets/url-properties/Makefile.am
View file

@ -2,14 +2,14 @@ INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(srcdir)/../../libcapplet \ -I$(srcdir)/../../libcapplet \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(CAPPLET_CFLAGS) \ @CAPPLET_CFLAGS@ \
-DGNOMESYSCONFDIR=\""$(sysconfdir)"\" -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
bin_PROGRAMS = url-properties bin_PROGRAMS = url-properties
url_properties_SOURCES = url-properties.c url_properties_SOURCES = url-properties.c
url_properties_LDADD = $(CAPPLET_LIBS) url_properties_LDADD = @CAPPLET_LIBS@
EXTRA_DIST = \ EXTRA_DIST = \
url-properties.desktop url-properties.desktop

4
capplets/wm-properties/Makefile.am
View file

@ -1,7 +1,7 @@
INCLUDES = -I. -I$(srcdir) \ INCLUDES = -I. -I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(CAPPLET_CFLAGS) @CAPPLET_CFLAGS@
bin_PROGRAMS = wm-properties-capplet bin_PROGRAMS = wm-properties-capplet
@ -12,7 +12,7 @@ wm_properties_capplet_SOURCES = \
wm-list.c \ wm-list.c \
wm-exec.c wm-exec.c
wm_properties_capplet_LDADD = $(CAPPLET_LIBS) wm_properties_capplet_LDADD = @CAPPLET_LIBS@
EXTRA_DIST = wm-properties.desktop EXTRA_DIST = wm-properties.desktop

59
configure.in
View file

@ -12,7 +12,7 @@ gnome_cv_use_gnome=yes
AM_ACLOCAL_INCLUDE(macros) AM_ACLOCAL_INCLUDE(macros)
GNOME_INIT(capplet) GNOME_INIT
GNOME_COMPILE_WARNINGS GNOME_COMPILE_WARNINGS
AC_ISC_POSIX AC_ISC_POSIX
@ -77,22 +77,6 @@ AC_MSG_ERROR([Fatal Error: no Imlib detected.])])
CFLAGS="-O2 -g -Wall $CFLAGS" 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
dnl Check for libximian_archiver and set the flag dnl Check for libximian_archiver and set the flag
dnl HAVE_LIBXIMIAN_ARCHIVER iff it is prsent dnl HAVE_LIBXIMIAN_ARCHIVER iff it is prsent
@ -102,8 +86,7 @@ vers=`$GNOME_CONFIG --modversion ximian_archiver 2>/dev/null`
case "x$vers" in case "x$vers" in
xximian-archiver-*) xximian-archiver-*)
AC_DEFINE(HAVE_XIMIAN_ARCHIVER) AC_DEFINE(HAVE_XIMIAN_ARCHIVER)
ARCHIVER_CFLAGS=`gnome-config --cflags ximian_archiver` ARCHIVER_MODULE=ximian_archiver
ARCHIVER_LIBS=`gnome-config --libs ximian_archiver`
AC_MSG_RESULT(found) AC_MSG_RESULT(found)
;; ;;
*) *)
@ -111,35 +94,21 @@ case "x$vers" in
;; ;;
esac esac
CAPPLET_CFLAGS="`gnome-config --cflags libglade capplet gdk_pixbuf` $ARCHIVER_CFLAGS" capplet_modules="libcapplet2 libglade gdk_pixbuf $ARCHIVER_MODULE"
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" PKG_CHECK_MODULES(CAPPLET, $capplet_modules)
BG_CAPPLET_LIBS="`gnome-config --libs libglade capplet gdk_pixbuf gdk_pixbuf_xlib` $ARCHIVER_LIBS" 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)
ROLLBACK_CAPPLET_CFLAGS="`gnome-config --cflags libglade capplet gdk_pixbuf` $ARCHIVER_CFLAGS" dnl gnome-vfs doesn't support gnome-config or pkg-config
ROLLBACK_CAPPLET_LIBS="`gnome-config --libs libglade capplet gdk_pixbuf` $ARCHIVER_LIBS" VFS_CFLAGS=`gnome-vfs-config --cflags`
VFS_LIBS=`gnome-vfs-config --libs`
GNOMECC_CFLAGS=`gnome-config --cflags gnomeui libglade xml gdk_pixbuf capplet gnomecanvaspixbuf gtkhtml` VFS_CAPPLET_CFLAGS="$VFS_CAPPLET_CFLAGS $VFS_CFLAGS"
GNOMECC_LIBS=`gnome-config --libs gnomeui libglade xml gdk_pixbuf capplet gnomecanvaspixbuf gtkhtml` VFS_CAPPLET_LIBS="$VFS_CAPPLET_LIBS $VFS_LIBS"
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)
AC_SUBST(GNOMECC_CFLAGS)
AC_SUBST(GNOMECC_LIBS)
AC_SUBST(RMHELPER_CFLAGS)
AC_SUBST(RMHELPER_LIBS)
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)

4
control-center/Makefile.am
View file

@ -32,7 +32,7 @@ INCLUDES = \
-DPIXMAPS_DIR=\""$(appicondir)"\" \ -DPIXMAPS_DIR=\""$(appicondir)"\" \
-DART_DIR=\""$(splashdir)"\" \ -DART_DIR=\""$(splashdir)"\" \
-DGNOME_SBINDIR=\""$(sbindir)"\" \ -DGNOME_SBINDIR=\""$(sbindir)"\" \
$(GNOMECC_CFLAGS) @GNOMECC_CFLAGS@
bin_PROGRAMS = gnomecc bin_PROGRAMS = gnomecc
@ -46,7 +46,7 @@ gnomecc_SOURCES = \
capplet-dir-view-list.c capplet-dir-view-list.c
gnomecc_LDADD = \ gnomecc_LDADD = \
$(GNOMECC_LIBS) \ @GNOMECC_LIBS@ \
$(INTLLIBS) $(INTLLIBS)
EXTRA_DIST = gnomecc.desktop $(appicon_DATA) $(splash_DATA) $(glade_DATA) EXTRA_DIST = gnomecc.desktop $(appicon_DATA) $(splash_DATA) $(glade_DATA)