Some build fixes
This commit is contained in:
parent
89669e136b
commit
047f48e850
8 changed files with 10 additions and 7 deletions
|
@ -13,7 +13,8 @@ libdefault_applications_la_SOURCES = \
|
||||||
|
|
||||||
libdefault_applications_la_LIBADD = \
|
libdefault_applications_la_LIBADD = \
|
||||||
$(PANEL_LIBS) \
|
$(PANEL_LIBS) \
|
||||||
$(XML_LIBS)
|
$(XML_LIBS) \
|
||||||
|
$(GNOMECC_CAPPLETS_LIBS)
|
||||||
|
|
||||||
libdefault_applications_la_LDFLAGS = $(PANEL_LDFLAGS)
|
libdefault_applications_la_LDFLAGS = $(PANEL_LDFLAGS)
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ libkeyboard_la_SOURCES = \
|
||||||
eggaccelerators.h
|
eggaccelerators.h
|
||||||
|
|
||||||
libkeyboard_la_CFLAGS = $(PANEL_CFLAGS)
|
libkeyboard_la_CFLAGS = $(PANEL_CFLAGS)
|
||||||
libkeyboard_la_LIBADD = $(PANEL_LIBS)
|
libkeyboard_la_LIBADD = $(PANEL_LIBS) $(GNOMECC_CAPPLETS_LIBS)
|
||||||
libkeyboard_la_LDFLAGS = $(PANEL_LDFLAGS)
|
libkeyboard_la_LDFLAGS = $(PANEL_LDFLAGS)
|
||||||
|
|
||||||
@INTLTOOL_DESKTOP_RULE@
|
@INTLTOOL_DESKTOP_RULE@
|
||||||
|
|
|
@ -24,7 +24,7 @@ libmouse_properties_la_SOURCES = \
|
||||||
gnome-mouse-accessibility.c \
|
gnome-mouse-accessibility.c \
|
||||||
gnome-mouse-accessibility.h
|
gnome-mouse-accessibility.h
|
||||||
|
|
||||||
libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(GSD_DBUS_LIBS)
|
libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(GSD_DBUS_LIBS) $(GNOMECC_CAPPLETS_LIBS)
|
||||||
libmouse_properties_la_LDFLAGS = $(PANEL_LDFLAGS)
|
libmouse_properties_la_LDFLAGS = $(PANEL_LDFLAGS)
|
||||||
|
|
||||||
@INTLTOOL_DESKTOP_RULE@
|
@INTLTOOL_DESKTOP_RULE@
|
||||||
|
|
|
@ -9,7 +9,7 @@ libnetwork_la_SOURCES = gnome-network-properties.c \
|
||||||
cc-network-panel.c \
|
cc-network-panel.c \
|
||||||
cc-network-panel.h \
|
cc-network-panel.h \
|
||||||
network-module.c
|
network-module.c
|
||||||
libnetwork_la_LIBADD = $(PANEL_LIBS)
|
libnetwork_la_LIBADD = $(PANEL_LIBS) $(GNOMECC_CAPPLETS_LIBS)
|
||||||
libnetwork_la_LDFLAGS = $(PANEL_LDFLAGS)
|
libnetwork_la_LDFLAGS = $(PANEL_LDFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -897,7 +897,7 @@ cb_delete_button_clicked (GtkWidget *button,
|
||||||
key = g_strconcat (LOCATION_DIR "/", esc, NULL);
|
key = g_strconcat (LOCATION_DIR "/", esc, NULL);
|
||||||
g_free (esc);
|
g_free (esc);
|
||||||
|
|
||||||
copy_location (key, "", client);
|
/* copy_location (key, "", client); */
|
||||||
gconf_client_recursive_unset (client, key,
|
gconf_client_recursive_unset (client, key,
|
||||||
GCONF_UNSET_INCLUDING_SCHEMA_NAMES, NULL);
|
GCONF_UNSET_INCLUDING_SCHEMA_NAMES, NULL);
|
||||||
gconf_client_suggest_sync (client, NULL);
|
gconf_client_suggest_sync (client, NULL);
|
||||||
|
|
|
@ -27,7 +27,7 @@ libregion_la_SOURCES = \
|
||||||
gnome-region-panel-xkbpv.c \
|
gnome-region-panel-xkbpv.c \
|
||||||
gnome-region-panel-xkb.h
|
gnome-region-panel-xkb.h
|
||||||
|
|
||||||
libregion_la_LIBADD = $(PANEL_LIBS) $(LIBGNOMEKBD_LIBS)
|
libregion_la_LIBADD = $(PANEL_LIBS) $(LIBGNOMEKBD_LIBS) $(GNOMECC_CAPPLETS_LIBS)
|
||||||
|
|
||||||
libregion_la_LDFLAGS = $(PANEL_LDFLAGS)
|
libregion_la_LDFLAGS = $(PANEL_LDFLAGS)
|
||||||
|
|
||||||
|
|
|
@ -63,6 +63,7 @@ gnome_sound_applet_LDADD = \
|
||||||
libgnomevolumecontrol.la \
|
libgnomevolumecontrol.la \
|
||||||
$(CANBERRA_LIBS) \
|
$(CANBERRA_LIBS) \
|
||||||
$(PULSEAUDIO_LIBS) \
|
$(PULSEAUDIO_LIBS) \
|
||||||
|
$(GNOMECC_CAPPLETS_LIBS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
gnome_sound_applet_SOURCES = \
|
gnome_sound_applet_SOURCES = \
|
||||||
|
@ -85,6 +86,7 @@ libsound_la_LDFLAGS = \
|
||||||
$(CANBERRA_LIBS) \
|
$(CANBERRA_LIBS) \
|
||||||
$(PULSEAUDIO_LIBS) \
|
$(PULSEAUDIO_LIBS) \
|
||||||
$(XML_LIBS) \
|
$(XML_LIBS) \
|
||||||
|
$(GNOMECC_CAPPLETS_LIBS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
libsound_la_SOURCES = \
|
libsound_la_SOURCES = \
|
||||||
|
|
|
@ -14,7 +14,7 @@ libuniversal_access_la_SOURCES = \
|
||||||
cc-ua-panel.c \
|
cc-ua-panel.c \
|
||||||
cc-ua-panel.h
|
cc-ua-panel.h
|
||||||
|
|
||||||
libuniversal_access_la_LIBADD = $(PANEL_LIBS)
|
libuniversal_access_la_LIBADD = $(PANEL_LIBS) $(GNOMECC_CAPPLETS_LIBS)
|
||||||
libuniversal_access_la_LDFLAGS = $(PANEL_LDFLAGS)
|
libuniversal_access_la_LDFLAGS = $(PANEL_LDFLAGS)
|
||||||
|
|
||||||
uidir = $(pkgdatadir)/ui
|
uidir = $(pkgdatadir)/ui
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue