diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-05-13 19:30:58 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-05-13 19:30:58 +0000 |
| commit | 77866eaf9bff4e40223e326e99c40d0077a935b5 (patch) | |
| tree | d8c774d845d50086c532770756c9fb317b2d9790 /Makefile.am | |
| parent | c74c6c91a6e0424d00ac0b71992555ce4f461117 (diff) | |
| download | glib-77866eaf9bff4e40223e326e99c40d0077a935b5.tar.gz | |
makefile.mingw.in tests/makefile.mingw.in Rename makefile.cygwin(.in) to
2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in
* tests/makefile.mingw.in
* build-dll: Rename makefile.cygwin(.in) to
makefile.mingw(.in), which better describes what it is. Move the
build of gmodule, gthread and gobject DLLs to makefiles in those
directories. Move resource file handling and build number bump to
build-dll, where it sits much cleaner.
* README.win32
* Makefile.am (EXTRA_DIST): Update accordingly.
* glib.h: Add G_PI, G_PI_2, G_PI_4, G_E, G_LN2, G_LN10 and
G_SQRT2. M_PI etc aren't necessarily in <math.h> in strict ISO C
implementations.
* glib.def: Add g_strcanon.
* gtree.c (g_tree_node_rotate_left): Remove unused variables.
* gwin32.c (g_win32_opendir): Remove unneeded statement.
gmodule:
* makefile.mingw.in: New file, with gmodule stuff
moved from ../makefile.mingw.in.
* Makefile.am: Add to EXTRA_DIST, and add rule to make makefile.mingw.
gobject:
* makefile.mingw.in
* gobject.def
* gobject.rc.in: New files, for Win32 (mingw) build.
* Makefile.am: Add to EXTRA_DIST. Add rules to produce the
corresponding non-*.in files.
* gtype.h: (Win32:) Mark _g_type_fundamental_last for
export/import from DLL.
gthread:
* makefile.mingw.in: New file, with gthread stuff moved from
../makefile.mingw.in.
* Makefile.am: Add to EXTRA_DIST, add rule to build makefile.mingw.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index f66c3a25a..b3c4d7970 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,8 @@ EXTRA_DIST = \ glib.def \ makefile.msc \ makefile.msc.in \ - makefile.cygwin \ - makefile.cygwin.in \ + makefile.mingw \ + makefile.mingw.in \ giowin32.c \ glibconfig.h.win32 \ glibconfig.h.win32.in \ @@ -107,7 +107,7 @@ config.h.win32: $(top_builddir)/config.status $(top_srcdir)/config.h.win32.in makefile.msc: $(top_builddir)/config.status $(top_srcdir)/makefile.msc.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -makefile.cygwin: $(top_builddir)/config.status $(top_srcdir)/makefile.cygwin.in +makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/makefile.mingw.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in |