]>
Commit | Line | Data |
---|---|---|
2937a4f2 | 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 | |
3 | @@ -1,14 +1,6 @@ | |
4 | noinst_LIBRARIES = libinit_balsa.a | |
5 | ||
6 | libinit_balsa_a_SOURCES = \ | |
7 | - $(BUILT_SOURCES) \ | |
8 | - $(GOB_SOURCES) \ | |
9 | - helper.c \ | |
10 | - helper.h \ | |
11 | - init_balsa.c \ | |
12 | - init_balsa.h | |
13 | - | |
14 | -BUILT_SOURCES = \ | |
15 | balsa-initdruid.c \ | |
16 | balsa-druid-page.c \ | |
17 | balsa-druid-page-error.c \ | |
18 | @@ -22,16 +14,18 @@ | |
19 | balsa-druid-page-welcome.h \ | |
20 | balsa-druid-page-user.h \ | |
21 | balsa-druid-page-directory.h \ | |
22 | - balsa-druid-page-finish.h | |
23 | - | |
24 | -GOB_SOURCES = \ | |
25 | + balsa-druid-page-finish.h \ | |
26 | balsa-initdruid.gob \ | |
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 \ | |
34 | + helper.c \ | |
35 | + helper.h \ | |
36 | + init_balsa.c \ | |
37 | + init_balsa.h | |
38 | ||
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 | |
43 | @@ -1,6 +1,6 @@ | |
44 | bin_PROGRAMS = balsa | |
45 | ||
46 | -balsa_BASE_SOURCES = \ | |
47 | +balsa_SOURCES = \ | |
48 | address-book.c \ | |
49 | address-book.h \ | |
50 | address-book-config.c \ | |
51 | @@ -52,14 +52,6 @@ | |
52 | spell-check.c \ | |
53 | spell-check.h | |
54 | ||
55 | -balsa_IDL_SOURCES = \ | |
56 | - balsa-common.c \ | |
57 | - balsa-skels.c \ | |
58 | - balsa-stubs.c | |
59 | -balsa_IDL_SOURCES = | |
60 | - | |
61 | -balsa_SOURCES = $(balsa_BASE_SOURCES) $(balsa_IDL_SOURCES) | |
62 | - | |
63 | INCLUDES = \ | |
64 | -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ | |
65 | -I$(top_srcdir) \ | |
66 | @@ -67,8 +59,6 @@ | |
67 | -I$(top_srcdir)/libmutt \ | |
68 | $(GNOME_INCLUDEDIR) | |
69 | ||
70 | -CFLAGS += $(GTKHTML_CFLAGS) $(PIXBUF_FLAGS) | |
71 | - | |
72 | balsa_LDADD = \ | |
73 | $(top_builddir)/libbalsa/libbalsa.a \ | |
74 | $(top_builddir)/libmutt/imap/libimap.a \ | |
75 | @@ -76,7 +66,7 @@ | |
76 | $(top_builddir)/libinit_balsa/libinit_balsa.a \ | |
77 | -lpspell \ | |
78 | -lltdl \ | |
79 | - @LIBESD_LIB@ \ | |
80 | + $(LIBESD_LIB) \ | |
81 | $(GNOME_LIBDIR) \ | |
82 | $(GNOMEUI_LIBS) \ | |
83 | $(INTLLIBS) \ | |
84 | @@ -85,27 +75,9 @@ | |
85 | $(GTKHTML_LIBS) \ | |
86 | $(PIXBUF_LIBS) | |
87 | ||
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) | |
95 | ||
96 | dist-hook: | |
97 | mkdir $(distdir)/pixmaps | |
98 | cp $(srcdir)/pixmaps/*.xpm $(distdir)/pixmaps | |
99 | ||
100 | -idldir = $(datadir)/idl | |
101 | - | |
102 | -idl_DATA = #../idl/balsa.idl | |
103 | - | |
104 | -CORBA_SRCLIST = balsa-common.c balsa-skels.c balsa-stubs.c \ | |
105 | - balsa.h | |
106 | - | |
107 | - | |
108 | -BALSA_ORB_SRCLIST = orbit-glue.c | |
109 | - | |
110 | - | |
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 | |
115 | @@ -62,8 +62,5 @@ | |
116 | server.h \ | |
117 | threads.h | |
118 | ||
119 | - | |
120 | -libbalsa_a_LIBADD = @LIBOBJS@ | |
121 | - | |
122 | INCLUDES=-I. -I${top_srcdir} -I${top_builddir}/libmutt \ | |
123 | $(GNOME_INCLUDEDIR) | |
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 | |
126 | @@ -2,7 +2,7 @@ | |
127 | ||
128 | EXTRA_DIST = $(balsa_BITMAPS) | |
129 | ||
130 | -balsabitmapsdir = @gnomedatadir@/pixmaps/balsa | |
131 | +balsabitmapsdir = $(gnomedatadir)/pixmaps/balsa | |
132 | ||
133 | balsabitmaps_DATA = $(balsa_BITMAPS) | |
134 | ||
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 | |
137 | @@ -3,8 +3,8 @@ | |
138 | ||
139 | EXTRA_DIST = $(balsa_SOUNDS) $(balsa_SOUNDLISTS) | |
140 | ||
141 | -balsasoundsdir = @gnomedatadir@/sounds/balsa | |
142 | +balsasoundsdir = $(gnomedatadir)/sounds/balsa | |
143 | balsasounds_DATA = $(balsa_SOUNDS) | |
144 | ||
145 | -soundlistdir = @gnomeconfdir@/sound/events | |
146 | +soundlistdir = $(gnomeconfdir)/sound/events | |
147 | soundlist_DATA = $(balsa_SOUNDLISTS) |