[Gaim-commits] CVS: gaim Makefile.am,1.28,1.29

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv14337

Modified Files:
	Makefile.am 
Log Message:
David Raeman's applet icons


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.am	2001/10/01 20:19:32	1.28
+++ Makefile.am	2001/10/09 23:40:18	1.29
@@ -2,6 +2,16 @@
 EXTRA_DIST = gaim.spec.in gaim_applet.gnorba gaim.desktop gaim_applet.desktop \
 	HACKING STATUS gaim2blt.pl
 
+if DISTRIB
+
+distribgnorbadir = $(sysconfdir)/CORBA/servers
+distribgnorba_DATA = gaim_applet.gnorba
+
+distribdesktopdir = $(datadir)/applets/Network
+distribdesktop_DATA = gaim_applet.desktop
+
+else
+
 if GNOMEAPPLET
 
 gnomesysconf = `@GNOME_CONFIG@ --sysconfdir`
@@ -15,37 +25,9 @@
 gaimdesktopdir = $(gnomedata)/applets/Network
 gaimdesktop_DATA = $(gaim_DESKTOP)
 
-# We dont need this no more :) I got good english =)
-#gaim_SOUND = gaim.soundlist
-#gaimsounddir = $(gnomesysconf)/sound/events
-#gaimsound_DATA = $(gaim_SOUND)
-
 endif
 
-if DISTRIB
-
-distribgnorbadir = $(sysconfdir)/CORBA/servers
-distribgnorba_DATA = gaim_applet.gnorba
-
-distribdesktopdir = $(datadir)/applets/Network
-distribdesktop_DATA = gaim_applet.desktop
-
-#Get outta here
-#distribsounddir = $(sysconfdir)/sound/events
-#distribsound_DATA = gaim.soundlist
-
 endif
-
-# we used to have gnome-configurable sound events, but now we can configure them
-# ourselves. isn't that lovely
-#
-#if GNOMEBITS
-#
-#bitssysconf = `@GNOME_CONFIG@ --sysconfdir`
-#bitssounddir = $(bitssysconf)/sound/events
-#bitssound_DATA = gaim.soundlist
-#
-#endif
 
 pixmapdir = $(datadir)/gnome/apps/Internet
 pixmap_DATA = gaim.desktop