projects / packages / evolution-data-server.git / blame
| Commit | Line | Data |
|---|---|---|
| c3bde048 AF |
1 | --- evolution-data-server-0.0.5/libedataserver/Makefile.am.wiget 2004-01-07 14:41:40.000000000 +0100 |
| 2 | +++ evolution-data-server-0.0.5/libedataserver/Makefile.am 2004-01-13 18:30:18.947392610 +0100 | |
| 3 | @@ -1,7 +1,6 @@ | |
| 4 | INCLUDES = \ | |
| ce5b54d2 | 5 | -I$(top_srcdir) \ |
| 6 | -DG_LOG_DOMAIN=\"e-data-server\" \ | |
| c3bde048 | 7 | - -I$(top_srcdir)/libdb/dist \ |
| ce5b54d2 | 8 | $(E_DATA_SERVER_CFLAGS) |
| 9 | ||
| 10 | # The marshallers | |
| c3bde048 | 11 | @@ -33,8 +32,7 @@ |
| ce5b54d2 | 12 | e-xml-hash-utils.c \ |
| 13 | md5-utils.c | |
| 14 | ||
| 15 | -libedataserver_la_LIBADD = \ | |
| 16 | - $(top_builddir)/libdb/dist/libdb.a | |
| 17 | +libedataserver_la_LIBADD = -ldb | |
| 18 | ||
| 19 | libedataserver_la_LDFLAGS = \ | |
| 20 | -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE) | |
| c3bde048 AF |
21 | --- evolution-data-server-0.0.5/configure.in.wiget 2004-01-12 20:12:36.000000000 +0100 |
| 22 | +++ evolution-data-server-0.0.5/configure.in 2004-01-13 18:29:40.807417203 +0100 | |
| 23 | @@ -272,7 +272,6 @@ | |
| 24 | export privincludedir | |
| 25 | export privdatadir | |
| 26 | AC_CONFIG_SUBDIRS(calendar/libical) | |
| 27 | -AC_CONFIG_SUBDIRS(libdb/dist) | |
| 28 | ||
| 29 | AC_OUTPUT([ | |
| 30 | Makefile | |
| 31 | @@ -301,7 +300,6 @@ | |
| 32 | calendar/backends/groupwise/Makefile | |
| 33 | calendar/backends/http/Makefile | |
| 34 | calendar/backends/contacts/Makefile | |
| 35 | -libdb/Makefile | |
| 36 | libedataserver/Makefile | |
| 37 | libedataserver/libedataserver-1.0.pc | |
| 38 | src/Makefile | |
| 39 | --- evolution-data-server-0.0.5/Makefile.am.wiget 2003-12-10 22:59:06.000000000 +0100 | |
| 40 | +++ evolution-data-server-0.0.5/Makefile.am 2004-01-13 18:27:59.979347761 +0100 | |
| ce5b54d2 | 41 | @@ -1,6 +1,6 @@ |
| 42 | DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc | |
| 43 | ||
| 44 | -SUBDIRS = libdb libedataserver addressbook calendar src docs po | |
| 45 | +SUBDIRS = libedataserver addressbook calendar src docs po | |
| 46 | DIST_SUBDIRS= libedataserver addressbook calendar src docs po | |
| 47 | ||
| c3bde048 AF |
48 | changelogs = \ |
| 49 | @@ -21,9 +21,10 @@ | |
| ce5b54d2 | 50 | intltool-merge.in \ |
| 51 | intltool-update.in \ | |
| 52 | intltool-extract.in \ | |
| 53 | - $(pkgconfig_DATA:.pc=.pc.in) \ | |
| 54 | - $(LIBDB_FILES) | |
| 55 | + $(pkgconfig_DATA:.pc=.pc.in) | |
| 56 | ||
| 57 | +# files below should be removed due to system db patch, but they are left, | |
| 58 | +# so patch is small | |
| 59 | LIBDB_FILES= \ | |
| 60 | $(srcdir)/libdb/Makefile.am \ | |
| 61 | $(srcdir)/libdb/Makefile.in \ |