1 diff -urN everybuddy-0.2.1beta6.org/Makefile.am everybuddy-0.2.1beta6/Makefile.am
2 --- everybuddy-0.2.1beta6.org/Makefile.am Tue Nov 13 09:21:39 2001
3 +++ everybuddy-0.2.1beta6/Makefile.am Tue Nov 13 16:59:39 2001
5 SUBDIRS = pixmaps m4 libproxy libtoc libicq libyahoo libmsn libxode libjabber sounds doc zephyr src
6 ACLOCAL_AMFLAGS = -I m4
8 -Utilitiesdir = /etc/X11/applnk/Internet
9 -Utilities_DATA = Everybuddy.desktop
10 +AUtilitiesdir = /etc/X11/applnk/Internet
11 +AUtilities_DATA = Everybuddy.desktop
14 EXTRA_DIST = Everybuddy.desktop everybuddy.spec
15 diff -urN everybuddy-0.2.1beta6.org/libicq/Makefile.am everybuddy-0.2.1beta6/libicq/Makefile.am
16 --- everybuddy-0.2.1beta6.org/libicq/Makefile.am Tue Nov 13 09:21:39 2001
17 +++ everybuddy-0.2.1beta6/libicq/Makefile.am Tue Nov 13 16:59:25 2001
22 -CFLAGS += $(EB_CFLAGS) $(GLIB_CFLAGS) -I../libproxy -D_XOPEN_SOURCE_EXTENDED \
23 +CFLAGS = @CFLAGS@ $(EB_CFLAGS) $(GLIB_CFLAGS) -I../libproxy -D_XOPEN_SOURCE_EXTENDED \
24 -I$(top_srcdir)/libproxy
26 diff -urN everybuddy-0.2.1beta6.org/libjabber/Makefile.am everybuddy-0.2.1beta6/libjabber/Makefile.am
27 --- everybuddy-0.2.1beta6.org/libjabber/Makefile.am Tue Nov 13 09:21:38 2001
28 +++ everybuddy-0.2.1beta6/libjabber/Makefile.am Tue Nov 13 16:59:25 2001
31 libEBjabber_a_SOURCES = libEBjabber.c
33 -CFLAGS += $(EB_CFLAGS) $(GLIB_CFLAGS) -I../src -I../libproxy \
34 +CFLAGS = @CFLAGS@ $(EB_CFLAGS) $(GLIB_CFLAGS) -I../src -I../libproxy \
35 -I./include/jabber -I./include\
36 -I$(top_srcdir)/libxode/include
37 libjabber_a_SOURCES = \
38 diff -urN everybuddy-0.2.1beta6.org/libmsn/Makefile.am everybuddy-0.2.1beta6/libmsn/Makefile.am
39 --- everybuddy-0.2.1beta6.org/libmsn/Makefile.am Tue Nov 13 09:21:39 2001
40 +++ everybuddy-0.2.1beta6/libmsn/Makefile.am Tue Nov 13 16:59:25 2001
43 libmsn_a_SOURCES = libmsn.c msn_commands.c parse_utils.c md5.c errors.c chat_lists.c
45 -CFLAGS += $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
46 +CFLAGS = @CFLAGS@ $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
48 diff -urN everybuddy-0.2.1beta6.org/libproxy/Makefile.am everybuddy-0.2.1beta6/libproxy/Makefile.am
49 --- everybuddy-0.2.1beta6.org/libproxy/Makefile.am Tue Nov 13 09:21:39 2001
50 +++ everybuddy-0.2.1beta6/libproxy/Makefile.am Tue Nov 13 16:59:25 2001
52 noinst_LIBRARIES = libproxy.a
54 EXTRA_DIST = libproxy.h
55 -CFLAGS += $(EB_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
56 +CFLAGS = @CFLAGS@ $(EB_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
59 libproxy_a_SOURCES = proxy.c
60 diff -urN everybuddy-0.2.1beta6.org/libtoc/Makefile.am everybuddy-0.2.1beta6/libtoc/Makefile.am
61 --- everybuddy-0.2.1beta6.org/libtoc/Makefile.am Tue Nov 13 09:21:39 2001
62 +++ everybuddy-0.2.1beta6/libtoc/Makefile.am Tue Nov 13 16:59:25 2001
65 libtoc_a_SOURCES = libtoc.c
67 -CFLAGS += $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
68 +CFLAGS = @CFLAGS@ $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
70 diff -urN everybuddy-0.2.1beta6.org/libyahoo/Makefile.am everybuddy-0.2.1beta6/libyahoo/Makefile.am
71 --- everybuddy-0.2.1beta6.org/libyahoo/Makefile.am Tue Nov 13 09:21:39 2001
72 +++ everybuddy-0.2.1beta6/libyahoo/Makefile.am Tue Nov 13 16:59:25 2001
75 libyahoo_a_SOURCES = yahoolib.c debug.c yahoo_util.c
77 -CFLAGS += $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
78 +CFLAGS = @CFLAGS@ $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
79 diff -urN everybuddy-0.2.1beta6.org/src/Makefile.am everybuddy-0.2.1beta6/src/Makefile.am
80 --- everybuddy-0.2.1beta6.org/src/Makefile.am Tue Nov 13 09:21:38 2001
81 +++ everybuddy-0.2.1beta6/src/Makefile.am Tue Nov 13 16:59:26 2001
84 everybuddy_SOURCES = main.c contactlist.c editcontacts.c service.c icq.c status.c account.c aim-toc.c info_window.c chat_window.c util.c add_contact_window.c edit_contact_window.c add_unknown_account.c sound.c about.c dialog.c prefs.c yahoo.c away_window.c browser.c message_parse.c progress_window.c chat_room.c account_scanner.c account_parser.tab.c contact_scanner.c contact_parser.tab.c value_pair.c msn.c jabber.c edit_group_window.c importicq.c importlicq.c log_window.c gtkspell.c trigger.c console_session.c gtk_eb_html.c gtksctext.c input_list.c zephyr_mod.c irc.c
86 -CFLAGS += $(EB_CFLAGS) -I$(top_srcdir) -I../libproxy -I../libfaim -I../libjabber/include/jabber -I../libjabber/include -I../libxode/include -I../zephyr/h
87 +CFLAGS = @CFLAGS@ $(EB_CFLAGS) -I$(top_srcdir) -I../libproxy -I../libfaim -I../libjabber/include/jabber -I../libjabber/include -I../libxode/include -I../zephyr/h
88 #there are more than one config.h
91 -CLEANFILES += config.h
92 +LIBS = @LIBS@ $(EB_LIBS)
94 +CLEANFILES = @CLEANFILES@ config.h
96 EXTRA_DIST = account.h icq.h aim.h msn.h yahoo.h service.h contact.h \
97 globals.h externs.h status.h info_window.h chat_window.h util.h \
98 diff -urN everybuddy-0.2.1beta6.org/zephyr/Makefile.am everybuddy-0.2.1beta6/zephyr/Makefile.am
99 --- everybuddy-0.2.1beta6.org/zephyr/Makefile.am Tue Nov 13 09:21:39 2001
100 +++ everybuddy-0.2.1beta6/zephyr/Makefile.am Tue Nov 13 16:59:26 2001
103 libzephyr_a_SOURCES = mit-copyright.h ZAsyncLocate.c ZCkAuth.c ZCkIfNot.c ZClosePort.c ZCmpUID.c ZCmpUIDP.c ZFlsLocs.c ZFlsSubs.c ZFmtAuth.c ZFmtList.c ZFmtNotice.c ZFmtRaw.c ZFmtRawLst.c ZFmtSmRLst.c ZFmtSmRaw.c ZFreeNot.c ZGetLocs.c ZGetSender.c ZGetSubs.c ZGetWGPort.c ZIfNotice.c ZInit.c ZLocations.c ZMakeAscii.c ZMkAuth.c ZNewLocU.c ZOpenPort.c ZParseNot.c ZPeekIfNot.c ZPeekNot.c ZPeekPkt.c ZPending.c ZReadAscii.c ZRecvNot.c ZRecvPkt.c ZRetSubs.c ZSendList.c ZSendNot.c ZSendPkt.c ZSendRLst.c ZSendRaw.c ZSetDest.c ZSetFD.c ZSetSrv.c ZSubs.c ZVariables.c ZWait4Not.c ZhmStat.c Zinternal.c zephyr_err.c
105 -CFLAGS += $(EB_CFLAGS) -I../src -I../libproxy -I./h -I$(top_srcdir) -DSYSCONFDIR=\"${sysconfdir}\"
106 +CFLAGS = @CFLAGS@ $(EB_CFLAGS) -I../src -I../libproxy -I./h -I$(top_srcdir) -DSYSCONFDIR=\"${sysconfdir}\"