2008-05-10 Geoff Norton <gnorton@novell.com>

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 38ef8d8ea272cd06cfd0b5215e8152e819bcf7b0..505aceda1a76448d76c66fa1dd812dc6b73dedb4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
+SUBDIRS = $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
 
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = libgc mono ikvm-native support docs data runtime scripts man samples web tools msvc
+DIST_SUBDIRS = libgc $(eglib_dir) mono ikvm-native support docs data runtime scripts man samples web tools msvc
 
-EXTRA_DIST= mono.pc.in mint.pc.in mono-uninstalled.pc.in dotnet.pc.in mono-cairo.pc.in cecil.pc.in LICENSE
+EXTRA_DIST= mono-uninstalled.pc.in LICENSE
 
 DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 
@@ -17,17 +17,8 @@ dist-hook:
        d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=default distdir=$$d dist-recursive
 
 pkgconfigdir = $(libdir)/pkgconfig
-if JIT_SUPPORTED
-if INTERP_SUPPORTED
-pkgconfig_DATA= mono.pc mint.pc dotnet.pc mono-cairo.pc cecil.pc
-else
-pkgconfig_DATA= mono.pc dotnet.pc mono-cairo.pc cecil.pc
-endif
-else
-pkgconfig_DATA= mint.pc mono-cairo.pc cecil.pc
-endif
 noinst_DATA = mono-uninstalled.pc
-DISTCLEANFILES= mono.pc mint.pc mono-uninstalled.pc dotnet.pc mono-cairo.pc cecil.pc
+DISTCLEANFILES= mono-uninstalled.pc
 
 .PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
 
@@ -37,6 +28,7 @@ monolite = $(mcslib)/monolite
 monolite_url = http://mono.ximian.com/daily/monolite-latest.tar.gz
 get-monolite-latest:
        -rm -fr $(mcslib)/monolite-*
+       -mkdir -p $(mcslib)
        test ! -d $(monolite) || test ! -d $(monolite).old || rm -fr $(monolite).old
        test ! -d $(monolite) || mv -f $(monolite) $(monolite).old
        cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }