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

clean the Makefile and start moving stuff to configure.in

Browse source
This commit is contained in:
Jose Maria Celorio 2001-07-17 08:35:15 +00:00
parent 30b5340397
commit 472c6272cf
5 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,7 +1,10 @@
2001-07-17 Chema Celorio <chema@celorio.com>
* acconfig.h: define GNOMECC_ICONS_DIR
* configure.in (vers): requre pkg-config 0.8.0
(GNOME_CONTROL_CENTER_ICONS_DIR): add
(GNOMECC_CAPPLETS_CFLAGS): define
2001-07-16 Richard Hestilow <hestilow@ximian.com>

1
acconfig.h
View file

@ -8,6 +8,7 @@
#undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
#undef HAVE_PROGRAM_INVOCATION_NAME
#undef HAVE_XIMIAN_ARCHIVER
#undef GNOMECC_ICONS_DIR
#undef PACKAGE
#undef VERSION

22
capplets/keyboard/Makefile.am
View file

@ -3,33 +3,21 @@
cappletname=keyboard
Gladedir = $(datadir)/control-center-data
Glade_DATA = \
keyboard-properties.glade
iconsdir = $(GNOME_CONTROL_CENTER_ICONS_DIR)
icons_DATA = keyboard-capplet.png
Glade_DATA = $(cappletname)-properties.glade
EXTRA_DIST = \
ChangeLog \
$(Glade_DATA) \
$(cappletname)-properties.desktop \
$(cappletname)-properties.desktop.in \
$(cappletname)-properties.desktop.in.in
$(GNOMECC_CAPPLETS_EXTRA_DIST)
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"keyboard-properties\" \
-DGLADE_DATADIR=\""$(Gladedir)"\" \
@CAPPLET_CFLAGS@ \
-I$(top_srcdir)/ \
-I$(top_srcdir)/intl
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
@GNOMECC_CAPPLETS_CFLAGS@
bin_PROGRAMS = keyboard-properties
keyboard_properties_SOURCES = \
prefs-widget.c prefs-widget.h \
preferences.c preferences.h \
preferences.c preferences.h \
main.c
keyboard_properties_LDADD = @CAPPLET_LIBS@ $(XF86MISC_LIBS)

2
capplets/keyboard/main.c
View file

@ -258,7 +258,7 @@ main (int argc, char **argv)
}
gnome_window_icon_set_default_from_file
(GNOME_ICONDIR"/gnome-cckeyboard.png");
(GNOMECC_ICONS_DIR"keyboard-capplet.png.png");
#ifdef HAVE_XIMIAN_ARCHIVER
archive = ARCHIVE (archive_load (FALSE));

13
configure.in
View file

@ -115,6 +115,14 @@ PKG_CHECK_MODULES(ARCHIVER, bonobo bonobo_conf xml)
PKG_CHECK_MODULES(MONIKER, bonobo bonobo_conf xml)
PKG_CHECK_MODULES(CONFIG_ARCHIVER, gnome xml)
GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} -I\$(top_srcdir)/intl -I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"keyboard-properties\\\"\" -DGLADE_DATADIR=\"\\\"${datadir}/control-center\\\"\""
AC_DEFINE_UNQUOTED(GNOMECC_ICONS_DIR, "${datadir}/${PACKAGE}/icons")
GNOMECC_ICONS_DIR=""${datadir}/${PACKAGE}/icons""
AC_SUBST(GNOMECC_ICONS_DIR)
AC_SUBST(GNOMECC_CAPPLETS_CFLAGS)
AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS)
@ -130,8 +138,9 @@ AC_SUBST(CONFIG_ARCHIVER_LIBDIR)
AC_SUBST(CONFIG_ARCHIVER_LIBS)
AC_SUBST(CONFIG_ARCHIVER_INCLUDEDIR)
GNOME_CONTROL_CENTER_ICONS_DIR="${datadir}/${PACKAGE}/icons"
AC_SUBST(GNOME_CONTROL_CENTER_ICONS_DIR)
GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(cappletname)-properties.desktop \$(cappletname)-properties.desktop.in \$(cappletname)-properties.desktop.in.in"
AC_SUBST(GNOMECC_CAPPLETS_EXTRA_DIST)
AC_OUTPUT([
control-center.spec