update
This commit is contained in:
parent
cee7d84639
commit
b7a5917b6a
2 changed files with 8 additions and 19 deletions
|
@ -1,7 +1,7 @@
|
||||||
AC_INIT(control-center)
|
AC_INIT(control-center)
|
||||||
|
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
AM_INIT_AUTOMAKE(control-center, 2.3.2)
|
AM_INIT_AUTOMAKE(control-center, 2.3.1)
|
||||||
|
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
|
@ -128,11 +128,6 @@ AC_SUBST(LIBBONOBO_IDL_DIR)
|
||||||
BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
|
BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
|
||||||
AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
|
AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
|
||||||
|
|
||||||
# check for nautilus
|
|
||||||
PKG_CHECK_MODULES(NAUTILUS, libnautilus)
|
|
||||||
AC_SUBST(NAUTILUS_LIBS)
|
|
||||||
AC_SUBST(NAUTILUS_CFLAGS)
|
|
||||||
|
|
||||||
# esd
|
# esd
|
||||||
ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound`
|
ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound`
|
||||||
if test x"$ESDSERVERDIR" = x; then
|
if test x"$ESDSERVERDIR" = x; then
|
||||||
|
|
|
@ -10,11 +10,6 @@ sys_in_files = gnomecc.desktop.in
|
||||||
sys_DATA = $(sys_in_files:.desktop.in=.desktop)
|
sys_DATA = $(sys_in_files:.desktop.in=.desktop)
|
||||||
@INTLTOOL_DESKTOP_RULE@
|
@INTLTOOL_DESKTOP_RULE@
|
||||||
|
|
||||||
serverdir = $(libdir)/bonobo/servers
|
|
||||||
server_in_files = GNOME_ControlCenter.server.in
|
|
||||||
server_DATA = $(server_in_files:.server.in=.server)
|
|
||||||
@INTLTOOL_SERVER_RULE@
|
|
||||||
|
|
||||||
uidir = $(datadir)/gnome-2.0/ui
|
uidir = $(datadir)/gnome-2.0/ui
|
||||||
ui_DATA = gnomecc-ui.xml
|
ui_DATA = gnomecc-ui.xml
|
||||||
|
|
||||||
|
@ -25,19 +20,18 @@ INCLUDES = \
|
||||||
-DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \
|
-DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \
|
||||||
-DART_DIR=\""$(splashdir)"\" \
|
-DART_DIR=\""$(splashdir)"\" \
|
||||||
-DGNOME_SBINDIR=\""$(sbindir)"\" \
|
-DGNOME_SBINDIR=\""$(sbindir)"\" \
|
||||||
$(GNOMECC_CFLAGS) $(NAUTILUS_CFLAGS)
|
$(GNOMECC_CFLAGS)
|
||||||
|
|
||||||
bin_PROGRAMS = gnome-control-center
|
bin_PROGRAMS = gnome-control-center
|
||||||
|
|
||||||
gnome_control_center_SOURCES = \
|
gnome_control_center_SOURCES = \
|
||||||
control-center-categories.c \
|
main.c \
|
||||||
control-center-categories.h \
|
capplet-dir.c capplet-dir.h \
|
||||||
control-center.c \
|
capplet-dir-view.c capplet-dir-view.h \
|
||||||
gnomecc-event-box.c \
|
capplet-dir-view-list.c
|
||||||
gnomecc-event-box.h
|
|
||||||
|
|
||||||
gnome_control_center_LDADD = $(GNOMECC_LIBS) $(NAUTILUS_LIBS)
|
gnome_control_center_LDADD = $(GNOMECC_LIBS)
|
||||||
|
|
||||||
EXTRA_DIST = gnomecc.desktop.in $(splash_DATA) $(ui_DATA) $(server_DATA)
|
EXTRA_DIST = gnomecc.desktop.in $(splash_DATA) $(ui_DATA)
|
||||||
|
|
||||||
CLEANFILES = gnomecc.desktop
|
CLEANFILES = gnomecc.desktop
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue