diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2000-04-26 02:42:37 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2000-04-26 02:42:37 +0800 |
| commit | 7e3a3892c4b93965198e5518f112679c4ff8bac6 (patch) | |
| tree | 7e8bccd1a7357e7b63bf5de025fa2d827ad4b52b | |
| parent | b19eff55b0c37c2137005cdba3555b50860828b3 (diff) | |
| download | gsoc2013-evolution-7e3a3892c4b93965198e5518f112679c4ff8bac6.tar.gz gsoc2013-evolution-7e3a3892c4b93965198e5518f112679c4ff8bac6.tar.zst gsoc2013-evolution-7e3a3892c4b93965198e5518f112679c4ff8bac6.zip | |
The Joy of Broken Makefiles Part #2.
svn path=/trunk/; revision=2609
| -rw-r--r-- | addressbook/ChangeLog | 11 | ||||
| -rw-r--r-- | addressbook/backend/ebook/Makefile.am | 22 |
2 files changed, 16 insertions, 17 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index f0bd6f790f..afb81167b1 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,14 @@ +2000-04-25 Ettore Perazzoli <ettore@helixcode.com> + + * backend/ebook/Makefile.am (ORBIT_IDL): Use `-I $(datadir)/idl' + to get the IDLs from the installation prefix as well. + (INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'. + (test_client_LDADD): Use `$(BONOBO_GNOME_LIBS)' instead of + hardcoding `-lbonobo'! Also get rid of some other useless flags, + as `$(BONOBO_GNOME_LIBS)' really has all what we need. + (test_client_list_LDADD): Likewise. + (test_card_LDADD): Likewise. + 2000-04-18 Federico Mena Quintero <federico@helixcode.com> * gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am index fb064888cd..3dfe72fec4 100644 --- a/addressbook/backend/ebook/Makefile.am +++ b/addressbook/backend/ebook/Makefile.am @@ -11,7 +11,7 @@ CORBA_SOURCE = \ idls = \ $(srcdir)/../idl/addressbook.idl -idl_flags = `$(GNOME_CONFIG) --cflags idl` +idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl $(CORBA_SOURCE): $(idls) $(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags) @@ -22,7 +22,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ - $(GNOME_INCLUDEDIR) + $(BONOBO_GNOME_CFLAGS) gnome_libs = \ $(GNOME_LIBDIR) \ @@ -65,11 +65,7 @@ test_client_SOURCES = \ test-client.c test_client_LDADD = \ - $(GTK_LIBS) \ - $(GNOME_LIBDIR) \ - $(GNOMEGNORBA_LIBS) \ - $(INTLLIBS) \ - -lbonobo \ + $(BONOBO_GNOME_LIBS) \ $(ebook_libs) \ $(top_builddir)/libversit/libversit.la @@ -77,11 +73,7 @@ test_client_list_SOURCES = \ test-client-list.c test_client_list_LDADD = \ - $(GTK_LIBS) \ - $(GNOME_LIBDIR) \ - $(GNOMEGNORBA_LIBS) \ - $(INTLLIBS) \ - -lbonobo \ + $(BONOBO_GNOME_LIBS) \ $(ebook_libs) \ $(top_builddir)/libversit/libversit.la @@ -89,11 +81,7 @@ test_card_SOURCES = \ test-card.c test_card_LDADD = \ - $(GTK_LIBS) \ - $(GNOME_LIBDIR) \ - $(GNOMEGNORBA_LIBS) \ - $(INTLLIBS) \ - -lbonobo \ + $(BONOBO_GNOME_LIBS) \ $(ebook_libs) \ $(top_builddir)/libversit/libversit.la |