diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/Makefile.am | 5 | ||||
| -rw-r--r-- | calendar/gncal.c | 2 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 5 |
4 files changed, 12 insertions, 7 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 5fd832a9a1..1855d0bb1a 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +Sun Mar 8 16:38:10 1998 Tom Tromey <tromey@cygnus.com> + + * Makefile.am (INCLUDES): Added GNOME_INCLUDEDIR. + (gncal_LDADD): Don't include libsupport.a. + + * gncal.c (main): Use new gnome_init. + 1998-02-19 Federico Mena Quintero <federico@nuclecu.unam.mx> * gncal.c (main): Added app_id "gncal". diff --git a/calendar/Makefile.am b/calendar/Makefile.am index 0ec00fc614..62d9d348ac 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ - -I$(includedir) - -I$(includedir) + -I$(includedir) \ + $(GNOME_INCLUDEDIR) bin_PROGRAMS = gncal @@ -13,7 +13,6 @@ gncal_SOURCES = \ gncal_LDADD = \ $(GNOME_LIBDIR) \ $(GNOMEUI_LIBS) \ - $(top_builddir)/support/libsupport.a \ $(INTLLIBS) EXTRA_DIST = \ diff --git a/calendar/gncal.c b/calendar/gncal.c index 769a1cabb0..7518c9868b 100644 --- a/calendar/gncal.c +++ b/calendar/gncal.c @@ -462,7 +462,7 @@ void show_main_window() int main(int argc, char *argv[]) { - gnome_init("gncal", &argc, &argv); + gnome_init("gncal", NULL, argc, argv, 0, NULL); show_main_window(); diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 0ec00fc614..62d9d348ac 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ - -I$(includedir) - -I$(includedir) + -I$(includedir) \ + $(GNOME_INCLUDEDIR) bin_PROGRAMS = gncal @@ -13,7 +13,6 @@ gncal_SOURCES = \ gncal_LDADD = \ $(GNOME_LIBDIR) \ $(GNOMEUI_LIBS) \ - $(top_builddir)/support/libsupport.a \ $(INTLLIBS) EXTRA_DIST = \ |