From: Christian H. <ch...@us...> - 2003-01-05 03:02:58
|
Update of /cvsroot/gaim/gaim/src/protocols/jabber In directory sc8-pr-cvs1:/tmp/cvs-serv3888/src/protocols/jabber Modified Files: Makefile.am Log Message: Much needed Makefile.am cleanups. Sorry for the large mass of commit e-mails, everyone. These changes should work on older versions of automake and newer versions. If you do have a problem, let me know, but it should be a smooth transition. Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.am 18 Aug 2002 19:32:05 -0000 1.5 +++ Makefile.am 5 Jan 2003 03:02:54 -0000 1.6 @@ -2,16 +2,7 @@ pkgdir = $(libdir)/gaim -CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS) -libjabber_la_LDFLAGS = -module -avoid-version - -if STATIC_JABBER - -st = -DSTATIC -pkg_LTLIBRARIES = -noinst_LIBRARIES = libjabber.a - -libjabber_a_SOURCES = \ +JABBERSOURCES = \ asciitab.h \ expat.c \ genhash.c \ @@ -53,54 +44,27 @@ \ jabber.c +AM_CFLAGS = $(st) + +libjabber_la_LDFLAGS = -module -avoid-version + +if STATIC_JABBER + +st = -DSTATIC +noinst_LIBRARIES = libjabber.a + +libjabber_a_SOURCES = $(JABBERSOURCES) libjabber_a_CFLAGS = $(AM_CFLAGS) else st = pkg_LTLIBRARIES = libjabber.la -noinst_LIBRARIES = -libjabber_la_SOURCES = \ - asciitab.h \ - expat.c \ - genhash.c \ - hashtable.c \ - hashtable.h \ - iasciitab.h \ - karma.c \ - latin1tab.h \ - lib.h \ - libxode.h \ - nametab.h \ - pool.c \ - sha.c \ - snprintf.c \ - socket.c \ - str.c \ - utf8tab.h \ - xhash.c \ - xmldef.h \ - xmlnode.c \ - xmlparse.c \ - xmlparse.h \ - xmlrole.c \ - xmlrole.h \ - xmltok.c \ - xmltok.h \ - xmltok_impl.h \ - xstream.c \ - \ - jabber.h \ - jconn.c \ - jid.c \ - jpacket.c \ - jutil.c \ - log.c \ - log.h \ - pproxy.c \ - rate.c \ - \ - jabber.c +libjabber_la_SOURCES = $(JABBERSOURCES) endif + +AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ + $(DEBUG_CFLAGS) |