[Gaim-commits] CVS: gaim/src Makefile.am,1.35,1.36

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

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

Modified Files:
	Makefile.am 
Log Message:
Arkadiusz Miskiewicz's patches to get automake 1.5 working, and so that it doesn't build .so.0 and .so.0.0.0. i need to do this for plugins/.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Makefile.am	2001/08/27 21:56:29	1.35
+++ Makefile.am	2001/09/21 20:47:36	1.36
@@ -62,28 +62,10 @@
 gaim_LDADD = @LDADD@ @LIBOBJS@
 endif
 
-# UI stuff. We do this here so the PRPLs aren't forced to link with it
-LIBS += $(UI_LIBS)
-
-# Sound libs. Just for fun
-LIBS += $(SOUND_LIBS)
-
-# Static protocols
-LIBS += $(STATIC_LINK_LIBS)
-
-# Perl stuff. plugins shouldn't need this either (right?)
 CFLAGS += $(PERL_CFLAGS)
-LIBS += $(PERL_LIBS)
-
-# X screensaver extension
-LIBS += $(XSS_LIBS)
-
-# gettext stuff
-LIBS += $(INTLLIBS)
-
-# any other stuff
 CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
-LIBS += $(DEBUG_LIBS)
+
+LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
 
 EXTRA_DIST =	applet.h \
 		convo.h \