1 --- balsa-1.1.7.new/libinit_balsa/Makefile.am~ Tue Oct 3 15:42:38 2000
2 +++ balsa-1.1.7.new/libinit_balsa/Makefile.am Sun Sep 9 21:24:57 2001
4 noinst_LIBRARIES = libinit_balsa.a
6 libinit_balsa_a_SOURCES = \
17 balsa-druid-page-error.c \
19 balsa-druid-page-welcome.h \
20 balsa-druid-page-user.h \
21 balsa-druid-page-directory.h \
22 - balsa-druid-page-finish.h
25 + balsa-druid-page-finish.h \
27 balsa-druid-page.gob \
28 balsa-druid-page-error.gob \
29 balsa-druid-page-welcome.gob \
30 balsa-druid-page-user.gob \
31 balsa-druid-page-directory.gob \
32 - balsa-druid-page-finish.gob
33 + balsa-druid-page-finish.gob \
39 INCLUDES=-I. -I$(top_srcdir) \
40 -I$(top_builddir)/libmutt \
41 --- balsa-1.1.7.new/src/Makefile.am~ Thu Jul 12 09:08:46 2001
42 +++ balsa-1.1.7.new/src/Makefile.am Sun Sep 9 21:35:34 2001
46 -balsa_BASE_SOURCES = \
50 address-book-config.c \
55 -balsa_IDL_SOURCES = \
61 -balsa_SOURCES = $(balsa_BASE_SOURCES) $(balsa_IDL_SOURCES)
64 -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
67 -I$(top_srcdir)/libmutt \
70 -CFLAGS += $(GTKHTML_CFLAGS) $(PIXBUF_FLAGS)
73 $(top_builddir)/libbalsa/libbalsa.a \
74 $(top_builddir)/libmutt/imap/libimap.a \
76 $(top_builddir)/libinit_balsa/libinit_balsa.a \
88 -balsa_DEPENDENCIES = \
89 - $(top_builddir)/libbalsa/libbalsa.a \
90 - $(top_builddir)/libmutt/libmutt.a \
91 - $(top_builddir)/libmutt/imap/libimap.a \
92 - $(top_builddir)/libmutt/libmutt.a \
93 - $(top_builddir)/libinit_balsa/libinit_balsa.a
94 +balsa_CFLAGS = $(GTKHTML_CFLAGS) $(PIXBUF_FLAGS)
97 mkdir $(distdir)/pixmaps
98 cp $(srcdir)/pixmaps/*.xpm $(distdir)/pixmaps
100 -idldir = $(datadir)/idl
102 -idl_DATA = #../idl/balsa.idl
104 -CORBA_SRCLIST = balsa-common.c balsa-skels.c balsa-stubs.c \
108 -BALSA_ORB_SRCLIST = orbit-glue.c
111 -$(CORBA_SRCLIST): $(idl_DATA)
112 - $(ORBIT_IDL) $(idl_DATA)
113 --- balsa-1.1.7.new/libbalsa/Makefile.am~ Thu Jul 12 09:08:46 2001
114 +++ balsa-1.1.7.new/libbalsa/Makefile.am Sun Sep 9 21:38:13 2001
120 -libbalsa_a_LIBADD = @LIBOBJS@
122 INCLUDES=-I. -I${top_srcdir} -I${top_builddir}/libmutt \
124 --- balsa-1.1.7/images/Makefile.am~ Wed Mar 29 05:14:44 2000
125 +++ balsa-1.1.7/images/Makefile.am Sun Sep 9 21:54:08 2001
128 EXTRA_DIST = $(balsa_BITMAPS)
130 -balsabitmapsdir = @gnomedatadir@/pixmaps/balsa
131 +balsabitmapsdir = $(gnomedatadir)/pixmaps/balsa
133 balsabitmaps_DATA = $(balsa_BITMAPS)
135 --- balsa-1.1.7/sounds/Makefile.am~ Thu Apr 13 19:38:24 2000
136 +++ balsa-1.1.7/sounds/Makefile.am Sun Sep 9 21:56:54 2001
139 EXTRA_DIST = $(balsa_SOUNDS) $(balsa_SOUNDLISTS)
141 -balsasoundsdir = @gnomedatadir@/sounds/balsa
142 +balsasoundsdir = $(gnomedatadir)/sounds/balsa
143 balsasounds_DATA = $(balsa_SOUNDS)
145 -soundlistdir = @gnomeconfdir@/sound/events
146 +soundlistdir = $(gnomeconfdir)/sound/events
147 soundlist_DATA = $(balsa_SOUNDLISTS)