diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 1998-12-15 05:28:02 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-12-15 05:28:02 +0000 |
| commit | 931ea952650b013b834041b91b0c37a748ffd449 (patch) | |
| tree | 0c97c450b0e07953d836f1603c6fcb0357a58149 /Makefile.am | |
| parent | c8ba100dab8949c49097f11004c09ef36ea5136f (diff) | |
| download | glib-931ea952650b013b834041b91b0c37a748ffd449.tar.gz | |
This commit merges the glib-threads branch into the main
branch. See the ChangeLog for details of the changes.
In brief overview:
- The set of threading functions can be set
- A default implementation is provided in -lgthread
- All static data structures are locked using these
functions if g_thread_init() is called.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index d2a10f588..a06082fa3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in # build . first, then SUBDIRS -SUBDIRS = gmodule docs +SUBDIRS = gmodule gthread docs all-recursive-am: all-am # alpha `automake' supports this better #SUBDIRS = . gmodule docs @@ -50,7 +50,8 @@ libglib_la_SOURCES = \ gstring.c \ gstrfuncs.c \ gscanner.c \ - gutils.c + gutils.c \ + gmutex.c include_HEADERS = \ glib.h |