1.1 --- a/Makefile.am	Thu Jun 22 15:16:11 2006 +0000
     1.2 +++ b/Makefile.am	Thu Jun 22 18:20:25 2006 +0000
     1.3 @@ -1,5 +1,8 @@
     1.4  ACLOCAL_AMFLAGS = -I m4
     1.5  
     1.6 +AM_CPPFLAGS = -I$(top_srcdir)
     1.7 +LDADD = $(top_builddir)/lemon/libemon.la
     1.8 +
     1.9  EXTRA_DIST = \
    1.10  	LICENSE \
    1.11  	lemon.spec \
    1.12 @@ -7,17 +10,26 @@
    1.13  	m4/lx_check_cplex.m4 \
    1.14  	m4/lx_check_glpk.m4
    1.15  
    1.16 -if WANT_DOC
    1.17 -  MAYBE_DOC = doc
    1.18 -endif
    1.19 -if WANT_DEMO
    1.20 -  MAYBE_DEMO = demo
    1.21 -endif
    1.22 -if WANT_BENCHMARK
    1.23 -  MAYBE_BENCHMARK = benchmark
    1.24 -endif
    1.25 +pkgconfigdir = $(libdir)/pkgconfig
    1.26 +lemondir = $(pkgincludedir)
    1.27 +bitsdir = $(lemondir)/bits
    1.28 +conceptdir = $(lemondir)/concept
    1.29 +pkgconfig_DATA =
    1.30 +lib_LTLIBRARIES =
    1.31 +lemon_HEADERS =
    1.32 +bits_HEADERS =
    1.33 +concept_HEADERS =
    1.34 +noinst_HEADERS =
    1.35 +noinst_PROGRAMS =
    1.36 +check_PROGRAMS =
    1.37 +TESTS =
    1.38 +XFAIL_TESTS =
    1.39  
    1.40 -SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_DOC) test
    1.41 +include lemon/Makefile.am
    1.42 +include test/Makefile.am
    1.43 +include doc/Makefile.am
    1.44 +include demo/Makefile.am
    1.45 +include benchmark/Makefile.am
    1.46  
    1.47  MRPROPERFILES = \
    1.48  	aclocal.m4 \
    1.49 @@ -39,16 +51,6 @@
    1.50  	benchmark/Makefile.in \
    1.51  	demo/Makefile.in
    1.52  
    1.53 -doc-clean:
    1.54 -	$(MAKE) -C doc $(AM_MAKEFLAGS) clean html
    1.55 -
    1.56 -doc:
    1.57 -	-rm -f doc/html/index.html
    1.58 -	$(MAKE) -C doc $(AM_MAKEFLAGS) html
    1.59 -
    1.60 -benchmark:
    1.61 -	$(MAKE) -C benchmark $(AM_MAKEFLAGS)
    1.62 -
    1.63  mrproper:
    1.64  	$(MAKE) $(AM_MAKEFLAGS) maintainer-clean
    1.65  	-rm -f $(MRPROPERFILES)
    1.66 @@ -68,4 +70,4 @@
    1.67  	zcat $(PACKAGE)-$(VERSION).tar.gz | \
    1.68  	bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
    1.69  
    1.70 -.PHONY: doc benchmark mrproper deb rpm dist-bz2 distcheck-bz2
    1.71 +.PHONY: mrproper deb rpm dist-bz2 distcheck-bz2