2009-06-09 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / io-layer / Makefile.am

diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am
index c0d06352ee75076c4dea31a1a77795b4fa2c7ba9..0b1f22feb9dc6bfe13ff7d079e41f2fef0edb526 100644 (file)
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -1,16 +1,17 @@
-lib_LIBRARIES = libwapi.a
+noinst_LTLIBRARIES = libwapi.la
 
 INCLUDES = \
        $(GLIB_CFLAGS)          \
-       $(GMODULE_CFLAGS)       \
-       -D_WAPI_BUILDING=1      \
+       $(LIBGC_CFLAGS)         \
        -DMONO_BINDIR=\""$(bindir)"\"   \
        -I$(top_srcdir) 
 
-libwapiincludedir = $(includedir)/mono/io-layer
+libwapiincludedir = $(includedir)/mono-$(API_VER)/mono/io-layer
 
 OTHER_H = \
+       access.h        \
        atomic.h        \
+       collection.h    \
        context.h       \
        critical-sections.h     \
        error.h         \
@@ -18,9 +19,13 @@ OTHER_H = \
        handles.h       \
        io.h            \
        io-layer.h      \
+       io-portability.h        \
        macros.h        \
+       messages.h      \
+       mono-mutex.h    \
        mutexes.h       \
        processes.h     \
+       security.h      \
        semaphores.h    \
        sockets.h       \
        status.h        \
@@ -31,17 +36,19 @@ OTHER_H = \
        uglify.h        \
        versioninfo.h   \
        wait.h          \
-       wapi.h  
+       wapi.h
 
 OTHER_SRC = \
+       access.h                \
        atomic.c                \
        atomic.h                \
+       collection.c            \
+       collection.h            \
        context.c               \
        context.h               \
        critical-sections.c     \
        critical-sections.h     \
-       daemon-messages.c       \
-       daemon-messages.h       \
+       critical-section-private.h      \
        error.c                 \
        error.h                 \
        events.c                \
@@ -52,9 +59,14 @@ OTHER_SRC = \
        handles-private.h       \
        io.c                    \
        io.h                    \
+       io-portability.c        \
+       io-portability.h        \
        io-private.h            \
        io-layer.h              \
+       locking.c               \
        macros.h                \
+       messages.c              \
+       messages.h              \
        misc.c                  \
        misc-private.h          \
        mutexes.c               \
@@ -62,9 +74,12 @@ OTHER_SRC = \
        mutex-private.h         \
        mono-mutex.c            \
        mono-mutex.h            \
+       mono-spinlock.h         \
        processes.c             \
        processes.h             \
        process-private.h       \
+       security.c              \
+       security.h              \
        semaphores.c            \
        semaphores.h            \
        semaphore-private.h     \
@@ -73,26 +88,27 @@ OTHER_SRC = \
        sockets.c               \
        sockets.h               \
        socket-private.h        \
+       socket-wrappers.h       \
        status.h                \
        system.c                \
        system.h                \
-       threads.c               \
        threads.h               \
        thread-private.h        \
        timefuncs.c             \
        timefuncs.h             \
        timefuncs-private.h     \
-       timed-thread.c          \
-       timed-thread.h          \
        types.h                 \
        uglify.h                \
-       unicode.c               \
-       unicode.h               \
+       versioninfo.c           \
        versioninfo.h           \
        wait.c                  \
        wait.h                  \
+       wapi_glob.h             \
+       wapi_glob.c             \
        wapi.h                  \
-       wapi-private.h
+       wapi-private.h          \
+       wthreads.c
+
 
 WINDOWS_H = \
        io-layer.h
@@ -101,28 +117,26 @@ WINDOWS_SRC = \
        io-layer.h              \
        io-layer-dummy.c
 
+HPPA_SRC = \
+       hppa_atomic.S
+
 if PLATFORM_WIN32
-libwapi_a_SOURCES = $(WINDOWS_SRC)
+libwapi_la_SOURCES = $(WINDOWS_SRC)
 libwapiinclude_HEADERS = $(WINDOWS_H)
 else
-libwapi_a_SOURCES = $(OTHER_SRC)
+if HPPA
+libwapi_la_SOURCES = $(OTHER_SRC) $(HPPA_SRC)
+# to enable pick up of config.h
+libwapi_la_CCASFLAGS = -I$(top_builddir)
+else
+libwapi_la_SOURCES = $(OTHER_SRC)
+endif
 libwapiinclude_HEADERS = $(OTHER_H)
-
-bin_PROGRAMS = mono-handle-d
-
-mono_handle_d_SOURCES = \
-       daemon.c        \
-       daemon-messages.c       \
-       daemon-messages.h
-
-mono_handle_d_LDADD = \
-       $(GLIB_LIBS) \
-       $(top_builddir)/mono/io-layer/libwapi.a \
-       $(top_builddir)/mono/utils/libmonoutils.a
 endif
 
 EXTRA_DIST =   \
        $(WINDOWS_SRC)  \
+        $(HPPA_SRC) \
        $(OTHER_SRC)