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

clean up; remove some duplicate / obsolete paths and bogus INCLUDE path

Browse source 
2002-03-05  jacob berkman  <jacob@ximian.com>

	* Makefile.am: clean up; remove some duplicate / obsolete paths
	and bogus INCLUDE path
This commit is contained in:
jacob berkman 2002-03-05 19:47:29 +00:00 • committed by Jacob Berkman
parent b2ecc22815
commit e01a6b6d04
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
control-center/ChangeLog
View file

@ -1,3 +1,8 @@
2002-03-05 jacob berkman <jacob@ximian.com>
* Makefile.am: clean up; remove some duplicate / obsolete paths
and bogus INCLUDE path
2002-02-28 Zbigniew Chyla <cyba@gnome.pl> 2002-02-28 Zbigniew Chyla <cyba@gnome.pl>
* capplet-dir.c (capplet_new, capplet_dir_new): * capplet-dir.c (capplet_new, capplet_dir_new):

16
control-center/Makefile.am
View file

@ -1,4 +1,4 @@
appicondir = $(datadir)/control-center-2/icons appicondir = $(GNOMECC_ICONS_DIR)
appicon_DATA = control-center.png appicon_DATA = control-center.png
splashdir = $(datadir)/pixmaps/gnomecc-2 splashdir = $(datadir)/pixmaps/gnomecc-2
@ -13,7 +13,7 @@ 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@
gladedir = $(datadir)/control-center-2/interfaces gladedir = $(GNOMECC_GLADE_DIR)
glade_DATA = \ glade_DATA = \
gnomecc.glade \ gnomecc.glade \
gnome-lockscreen.png \ gnome-lockscreen.png \
@ -24,13 +24,11 @@ glade_DATA = \
INCLUDES = \ INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGLADEDIR=\""$(datadir)/control-center-2/interfaces"\" \ -DGLADEDIR=\""$(gladedir)"\" \
-DVERSION=\""$(VERSION)"\" \ -DSETTINGS_DIR=\""$(GNOMECC_DESKTOP_DIR)"\" \
-DSETTINGS_DIR=\""$(datadir)/control-center-2/capplets"\" \
-DPIXMAPS_DIR=\""$(appicondir)"\" \ -DPIXMAPS_DIR=\""$(appicondir)"\" \
-DART_DIR=\""$(splashdir)"\" \ -DART_DIR=\""$(splashdir)"\" \
-DGNOME_SBINDIR=\""$(sbindir)"\" \ -DGNOME_SBINDIR=\""$(sbindir)"\" \
-I/gnome/head/INSTALL/include/gnome-desktop-2.0 \
@GNOMECC_CFLAGS@ @GNOMECC_CFLAGS@
bin_PROGRAMS = gnome2-control-center bin_PROGRAMS = gnome2-control-center
@ -44,12 +42,8 @@ gnome2_control_center_SOURCES = \
# capplet-dir-view-tree.c # capplet-dir-view-tree.c
gnome2_control_center_LDADD = \ gnome2_control_center_LDADD = $(GNOMECC_LIBS)
@GNOMECC_LIBS@ \
-lgnome-desktop-2
EXTRA_DIST = gnomecc.desktop.in $(appicon_DATA) $(splash_DATA) $(glade_DATA) EXTRA_DIST = gnomecc.desktop.in $(appicon_DATA) $(splash_DATA) $(glade_DATA)
paneldir = $(datadir)/gnome/apps/Settings
CLEANFILES=gnomecc.desktop CLEANFILES=gnomecc.desktop