[Gaim-commits] CVS: gaim/src .cvsignore,1.2,1.3 Makefile.am,1.46,1.47 applet.c,1.33,NONE applet.h,1.7,NONE ticker.c,1.19,NONE

[Sean E. <sea...@us...>]

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

Modified Files:
	.cvsignore Makefile.am 
Removed Files:
	applet.c applet.h ticker.c 
Log Message:
HEAD is now GTK 2 only.  If you want to use GTK1.2, use our gtk1_stable branch.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gaim/gaim/src/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	26 Mar 2000 08:53:59 -0000	1.2
+++ .cvsignore	25 Aug 2002 04:59:34 -0000	1.3
@@ -3,4 +3,4 @@
 .deps
 .libs
 gaim  
-gaim_applet
+

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Makefile.am	11 Aug 2002 06:42:16 -0000	1.46
+++ Makefile.am	25 Aug 2002 04:59:34 -0000	1.47
@@ -1,38 +1,5 @@
 SUBDIRS = protocols
 
-if GNOMEAPPLET
-bin_PROGRAMS = gaim_applet
-gaim_applet_SOURCES =	about.c \
-			aim.c \
-			applet.c \
-			away.c \
-			browser.c \
-			buddy.c \
-			buddy_chat.c \
-			conversation.c \
-			core.c \
-			dialogs.c \
-			gaimrc.c \
-			gtkimhtml.c \
-			gtkspell.c \
-			html.c \
-			idle.c \
-			list.c \
-			md5.c \
-			module.c \
-			multi.c \
-			perl.c \
-			plugins.c \
-			prefs.c \
-			proxy.c \
-			prpl.c \
-			server.c \
-			sound.c \
-			util.c
-gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
-gaim_applet_LDFLAGS = -export-dynamic
-gaim_applet_LDADD = @LDADD@ @LIBOBJS@
-else
 bin_PROGRAMS = gaim
 gaim_SOURCES =	about.c \
 		aim.c \
@@ -64,12 +31,11 @@
 gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
 gaim_LDFLAGS = -export-dynamic
 gaim_LDADD = @LDADD@ @LIBOBJS@
-endif
 
 CFLAGS += $(PERL_CFLAGS)
 CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS) -DDATADIR=\"$(datadir)\"
 
-LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
+LIBS = @LIBS@ $(GTK_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
 
 EXTRA_DIST =	applet.h \
 		convo.h \

--- applet.c DELETED ---

--- applet.h DELETED ---

--- ticker.c DELETED ---