diff options
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | libibex/ChangeLog | 4 | ||||
| -rw-r--r-- | libibex/Makefile | 30 | ||||
| -rw-r--r-- | libibex/Makefile.am | 22 |
4 files changed, 36 insertions, 30 deletions
diff --git a/configure.in b/configure.in index 36b069b690..f0e5d704fe 100644 --- a/configure.in +++ b/configure.in @@ -112,7 +112,9 @@ dnl ****************************** AC_MSG_CHECKING(For libunicode) if unicode-config --libs > /dev/null 2>&1; then UNICODE_LIBS=`unicode-config --libs` + UNICODE_CFLAGS=`unicode-config --cflags` AC_SUBST(UNICODE_LIBS) + AC_SUBST(UNICODE_CFLAGS) AC_MSG_RESULT(found) else AC_MSG_ERROR(libunicode not found) @@ -136,6 +138,13 @@ else THREADS_CFLAGS="" fi +GLIB_CFLAGS="`glib-config --cflags`" +GLIB_LIBS="`glib-config --libs`" + +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + + EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui libglade gdk_pixbuf gnomecanvaspixbuf ` $THREADS_LIBS `unicode-config --libs`" EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui libglade gdk_pixbuf gnomecanvaspixbuf ` $THREADS_CFLAGS `unicode-config --cflags`" @@ -194,6 +203,7 @@ intl/Makefile po/Makefile.in e-util/Makefile doc/Makefile +libibex/Makefile camel/Makefile camel/providers/Makefile camel/providers/MH/Makefile diff --git a/libibex/ChangeLog b/libibex/ChangeLog index d5b183c451..c527f6ec4b 100644 --- a/libibex/ChangeLog +++ b/libibex/ChangeLog @@ -1,3 +1,7 @@ +2000-02-16 Dan Winship <danw@helixcode.com> + + * Makefile.am: automakify + 2000-02-16 NotZed <NotZed@HelixCode.com> * find.[ch] (ibex_find_name): Finds if a word is indexed under a diff --git a/libibex/Makefile b/libibex/Makefile deleted file mode 100644 index 8cc2c1b873..0000000000 --- a/libibex/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -OBJS=file.lo index.lo find.lo words.lo -MKINDEXOBJS=mkindex.lo -LOOKUPOBJS=lookup.lo - -CFLAGS=${PROF} -g -Wall -Wstrict-prototypes -Wmissing-prototypes `glib-config --cflags` `unicode-config --cflags` -LDFLAGS=${PROF} - -LIBTOOL=sh ../libtool - -all: libibex.la mkindex lookup - -%.lo: %.c - $(LIBTOOL) --mode compile $(CC) $(CFLAGS) -c -o $@ $< - -libibex.la: ${OBJS} - $(LIBTOOL) --mode link $(CC) -static $^ -o $@ - -mkindex: ${MKINDEXOBJS} libibex.la - ${LIBTOOL) --mode link $(CC) ${LDFLAGS} -o mkindex ${MKINDEXOBJS} libibex.la \ - `glib-config --libs` `unicode-config --libs` - -lookup: ${LOOKUPOBJS} libibex.la - $(LIBTOOL) --mode link ${CC} ${LDFLAGS} -o lookup ${LOOKUPOBJS} libibex.la \ - `glib-config --libs` `unicode-config --libs` - -clean: - rm -f ${OBJS} libibex.la - rm -f ${MKINDEXOBJS} mkindex - rm -f ${LOOKUPOBJS} lookup - rm -f *.core *~ INDEX
\ No newline at end of file diff --git a/libibex/Makefile.am b/libibex/Makefile.am new file mode 100644 index 0000000000..6bbd72034f --- /dev/null +++ b/libibex/Makefile.am @@ -0,0 +1,22 @@ +## Process this file with automake to produce Makefile.in + +lib_LTLIBRARIES = libibex.la + +libibex_la_SOURCES = file.c index.c find.c words.c + +include_HEADERS = ibex.h + +noinst_HEADERS = ibex_internal.h + +INCLUDES = -I$(srcdir) $(GLIB_CFLAGS) $(UNICODE_CFLAGS) + + +noinst_PROGRAMS = mkindex lookup + +mkindex_SOURCES = mkindex.c + +mkindex_LDADD = libibex.la $(GLIB_LIBS) $(UNICODE_LIBS) + +lookup_SOURCES = lookup.c + +lookup_LDADD = libibex.la $(GLIB_LIBS) $(UNICODE_LIBS) |