Mercurial > pidgin
changeset 6360:2e23ccbccdec
[gaim-migrate @ 6864]
Lots of Makefile.am and configure.ac fixes from Robot101. Doumo arigatou,
Mr. Roboto!
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Sun, 03 Aug 2003 09:47:15 +0000 |
| parents | dfde69e105ae |
| children | d47ec1cba7d3 |
| files | configure.ac plugins/Makefile.am plugins/docklet/Makefile.am plugins/gaim-remote/Makefile.am plugins/gestures/Makefile.am plugins/perl/Makefile.am plugins/ticker/Makefile.am src/Makefile.am src/protocols/gg/Makefile.am src/protocols/icq/Makefile.am src/protocols/irc/Makefile.am src/protocols/jabber/Makefile.am src/protocols/msn/Makefile.am src/protocols/napster/Makefile.am src/protocols/oscar/Makefile.am src/protocols/toc/Makefile.am src/protocols/trepia/Makefile.am src/protocols/yahoo/Makefile.am src/protocols/zephyr/Makefile.am |
| diffstat | 19 files changed, 68 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sun Aug 03 02:21:39 2003 +0000 +++ b/configure.ac Sun Aug 03 09:47:15 2003 +0000 @@ -19,8 +19,8 @@ AM_GNU_GETTEXT_VERSION(0.10.40) AM_GNU_GETTEXT -AC_CYGWIN - +dnl we don't use autobreak on cygwin!! +dnl AC_CYGWIN dnl Checks for header files. AC_HEADER_STDC @@ -77,9 +77,6 @@ ]) ]) -dnl This is a bad, bad hack. I am a bad, bad man. -CFLAGS="$CFLAGS -I/opt/include -I\$(top_srcdir)" - AC_ARG_ENABLE(distrib,,,enable_distrib=no) AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes") AC_ARG_ENABLE(multi, [ --disable-multi disable multiple connections],,enable_multi=yes) @@ -135,7 +132,7 @@ AC_ARG_WITH(krb4, [ --with-krb4=PREFIX Compile Zephyr plugin with Kerberos 4 support],kerberos="$withval",kerberos="no") if test "$enable_debug" = yes ; then - CFLAGS="$CFLAGS -Wall -g3 -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" + DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall -g3 -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.]) fi @@ -149,7 +146,7 @@ *** always available at http://www.gtk.org/.])) AC_PATH_PROG(gaimpath, gaim) -CFLAGS="$CFLAGS $GTK_CFLAGS" +AC_SUBST(GTK_CFLAGS) AC_PATH_XTRA # We can't assume that $x_libraries will be set, because autoconf does not @@ -313,11 +310,11 @@ if test "$ac_cv_cygwin" = yes ; then LDADD="$LDADD -static" - CFLAGS="$CFLAGS -Wall -g" + DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall -g" AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.]) fi -AC_SUBST(CFLAGS) +AC_SUBST(DEBUG_CFLAGS) AC_SUBST(LDADD) AC_SUBST(LIBS)
--- a/plugins/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/plugins/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -52,10 +52,12 @@ fortuneprofile.pl AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ + -DDATADIR=\"$(datadir)\" \ -DVERSION=\"$(VERSION)\" \ - -DDATADIR=\"$(datadir)\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src \ $(DEBUG_CFLAGS) \ + $(GTK_CFLAGS) \ $(PLUGIN_CFLAGS) #
--- a/plugins/docklet/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/plugins/docklet/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -19,8 +19,10 @@ endif -INCLUDES = \ - -I$(top_srcdir)/src \ +AM_CPPFLAGS = \ + -DDATADIR=\"$(datadir)\" \ -DVERSION=\"$(VERSION)\" \ - -DDATADIR=\"$(datadir)\" \ - $(DEBUG_CFLAGS) + -I$(top_srcdir) \ + -I$(top_srcdir)/src \ + $(DEBUG_CFLAGS) \ + $(GTK_CFLAGS)
--- a/plugins/gaim-remote/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/plugins/gaim-remote/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -22,10 +22,10 @@ endif - -INCLUDES = \ +AM_CPPFLAGS = \ + -DDATADIR=\"$(datadir)\" \ + -DVERSION=\"$(VERSION)\" \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/plugins \ - -DVERSION=\"$(VERSION)\" \ - -DDATADIR=\"$(datadir)\" \ + $(GTK_CFLAGS) \ $(DEBUG_CFLAGS)
--- a/plugins/gestures/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/plugins/gestures/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -15,8 +15,10 @@ endif -INCLUDES = \ - -I$(top_srcdir)/src \ +AM_CPPFLAGS = \ + -DDATADIR=\"$(datadir)\" \ -DVERSION=\"$(VERSION)\" \ - -DDATADIR=\"$(datadir)\" \ - $(DEBUG_CFLAGS) + -I$(top_srcdir) \ + -I$(top_srcdir)/src \ + $(DEBUG_CFLAGS) \ + $(GTK_CFLAGS)
--- a/plugins/perl/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/plugins/perl/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -10,8 +10,10 @@ perl_la_SOURCES = perl.c AM_CPPFLAGS = \ + -DVERSION=\"$(VERSION)\" \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -DVERSION=\"$(VERSION)\" \ $(DEBUG_CFLAGS) \ + $(GTK_CFLAGS) \ $(PLUGIN_CFLAGS) \ $(PERL_CFLAGS)
--- a/plugins/ticker/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/plugins/ticker/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -16,10 +16,10 @@ endif -CFLAGS += $(DEBUG_CFLAGS) -DDATADIR=\"$(datadir)\" - - -INCLUDES = \ +AM_CPPFLAGS = \ + -DDATADIR=\"$(datadir)\" \ + -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -DVERSION=\"$(VERSION)\" + $(DEBUG_CFLAGS) \ + $(GTK_CFLAGS)
--- a/src/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -156,11 +156,13 @@ -L$(top_builddir)/plugins/gaim-remote -lgaim-remote AM_CPPFLAGS = \ - $(GTKSPELL_CFLAGS) \ + -DDATADIR=\"$(datadir)\" \ + -DLIBDIR=\"$(libdir)/gaim/\" \ + -DLOCALEDIR=\"$(datadir)/locale\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/plugins \ $(AUDIOFILE_CFLAGS) \ $(AO_CFLAGS) \ - -DLOCALEDIR=\"$(datadir)/locale\" \ - -DLIBDIR=\"$(libdir)/gaim/\" \ - -DDATADIR=\"$(datadir)\" \ $(DEBUG_CFLAGS) \ - -I$(top_srcdir)/plugins + $(GTK_CFLAGS) \ + $(GTKSPELL_CFLAGS)
--- a/src/protocols/gg/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/protocols/gg/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -32,5 +32,7 @@ endif AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ - $(DEBUG_CFLAGS) + $(DEBUG_CFLAGS) \ + $(GTK_CFLAGS)
--- a/src/protocols/icq/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/protocols/icq/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -63,5 +63,7 @@ libicq_la_SOURCES = $(ICQSOURCES) AM_CPPFLAGS = \ + -I$(top_srcdir)c \ -I$(top_srcdir)/src \ - $(DEBUG_CFLAGS) + $(DEBUG_CFLAGS) \ + $(GTK_CFLAGS)
--- a/src/protocols/irc/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/protocols/irc/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -28,5 +28,7 @@ endif AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ + $(GTK_CFLAGS) \ $(DEBUG_CFLAGS)
--- a/src/protocols/jabber/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/protocols/jabber/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -71,5 +71,7 @@ endif AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ - $(DEBUG_CFLAGS) + $(DEBUG_CFLAGS) \ + $(GTK_CFLAGS)
--- a/src/protocols/msn/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/protocols/msn/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -56,5 +56,7 @@ endif AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ + $(GTK_CFLAGS) \ $(DEBUG_CFLAGS)
--- a/src/protocols/napster/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/protocols/napster/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -22,5 +22,7 @@ endif AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ + $(GTK_CFLAGS) \ $(DEBUG_CFLAGS)
--- a/src/protocols/oscar/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/protocols/oscar/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -67,5 +67,7 @@ endif AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ + $(GTK_CFLAGS) \ $(DEBUG_CFLAGS)
--- a/src/protocols/toc/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/protocols/toc/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -26,5 +26,7 @@ endif AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ + $(GTK_CFLAGS) \ $(DEBUG_CFLAGS)
--- a/src/protocols/trepia/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/protocols/trepia/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -26,5 +26,7 @@ endif AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ + $(GTK_CFLAGS) \ $(DEBUG_CFLAGS)
--- a/src/protocols/yahoo/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/protocols/yahoo/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -28,5 +28,7 @@ endif AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ + $(GTK_CFLAGS) \ $(DEBUG_CFLAGS)
--- a/src/protocols/zephyr/Makefile.am Sun Aug 03 02:21:39 2003 +0000 +++ b/src/protocols/zephyr/Makefile.am Sun Aug 03 09:47:15 2003 +0000 @@ -89,8 +89,10 @@ endif AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -I\$(top_srcdir)/src/protocols \ + -I$(top_srcdir)/src/protocols \ -DCONFDIR=\"$(confdir)\" \ + $(GTK_CFLAGS) \ $(KRB4_CFLAGS) \ $(DEBUG_CFLAGS)