[Gaim-commits] CVS: gaim/src/protocols/msn Makefile.am,1.8,1.9

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1:/tmp/cvs-serv3888/src/protocols/msn

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/msn/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	18 Aug 2002 19:32:05 -0000	1.8
+++ Makefile.am	5 Jan 2003 03:02:55 -0000	1.9
@@ -2,25 +2,27 @@
 
 pkgdir = $(libdir)/gaim
 
-CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
+MSNSOURCES = msn.c
+
+AM_CFLAGS = $(st)
+
 libmsn_la_LDFLAGS = -module -avoid-version
 
 if STATIC_MSN
 
 st = -DSTATIC
-pkg_LTLIBRARIES =
 noinst_LIBRARIES = libmsn.a
-
-libmsn_a_SOURCES = msn.c
-
-libmsn_a_CFLAGS = $(AM_CFLAGS)
+libmsn_a_SOURCES = $(MSNSOURCES)
+libmsn_a_CFLAGS  = $(AM_CFLAGS)
 
 else
 
 st =
-pkg_LTLIBRARIES = libmsn.la
-noinst_LIBRARIES =
-
-libmsn_la_SOURCES = msn.c
+pkg_LTLIBRARIES   = libmsn.la
+libmsn_la_SOURCES = $(MSNSOURCES)
 
 endif
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	$(DEBUG_CFLAGS)