Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

Commit

Permalink
glib/Makefile.am glib.def and gobject.def are generated, not in $(src…
Browse files Browse the repository at this point in the history
…dir).

2005-01-06  Tor Lillqvist  <tml@iki.fi>

	* glib/Makefile.am
	* gobject/Makefile.am: glib.def and gobject.def are generated, not
	in $(srcdir). (#163143, J. Ali Harlow)
  • Loading branch information
tml1024 authored and Tor Lillqvist committed Jan 6, 2005
1 parent f4e1b4c commit b687214
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 4 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
@@ -1,3 +1,9 @@
2005-01-06 Tor Lillqvist <tml@iki.fi>

* glib/Makefile.am
* gobject/Makefile.am: glib.def and gobject.def are generated, not
in $(srcdir). (#163143, J. Ali Harlow)

2005-01-05 Matthias Clasen <mclasen@redhat.com>

* glib/gutils.h: Simplify the inlining magic to make it
Expand Down
6 changes: 6 additions & 0 deletions ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
2005-01-06 Tor Lillqvist <tml@iki.fi>

* glib/Makefile.am
* gobject/Makefile.am: glib.def and gobject.def are generated, not
in $(srcdir). (#163143, J. Ali Harlow)

2005-01-05 Matthias Clasen <mclasen@redhat.com>

* glib/gutils.h: Simplify the inlining magic to make it
Expand Down
6 changes: 6 additions & 0 deletions ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
2005-01-06 Tor Lillqvist <tml@iki.fi>

* glib/Makefile.am
* gobject/Makefile.am: glib.def and gobject.def are generated, not
in $(srcdir). (#163143, J. Ali Harlow)

2005-01-05 Matthias Clasen <mclasen@redhat.com>

* glib/gutils.h: Simplify the inlining magic to make it
Expand Down
6 changes: 6 additions & 0 deletions ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
2005-01-06 Tor Lillqvist <tml@iki.fi>

* glib/Makefile.am
* gobject/Makefile.am: glib.def and gobject.def are generated, not
in $(srcdir). (#163143, J. Ali Harlow)

2005-01-05 Matthias Clasen <mclasen@redhat.com>

* glib/gutils.h: Simplify the inlining magic to make it
Expand Down
6 changes: 6 additions & 0 deletions ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
2005-01-06 Tor Lillqvist <tml@iki.fi>

* glib/Makefile.am
* gobject/Makefile.am: glib.def and gobject.def are generated, not
in $(srcdir). (#163143, J. Ali Harlow)

2005-01-05 Matthias Clasen <mclasen@redhat.com>

* glib/gutils.h: Simplify the inlining magic to make it
Expand Down
4 changes: 2 additions & 2 deletions glib/Makefile.am
Expand Up @@ -193,7 +193,7 @@ endif

if OS_WIN32
# This requires a very new libtool
export_symbols = -export-symbols $(srcdir)/glib.def
export_symbols = -export-symbols glib.def

install-libtool-import-lib:
# Don't put the binary compatibility entries in the import lib!
Expand All @@ -205,7 +205,7 @@ install-libtool-import-lib:
ar d .libs/libglib-2.0.dll.a $$file; \
done
$(INSTALL) .libs/libglib-2.0.dll.a $(DESTDIR)$(libdir)
$(INSTALL) $(srcdir)/glib.def $(DESTDIR)$(libdir)/glib-2.0.def
$(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def

uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libglib-2.0.dll.a $(DESTDIR)$(libdir)/glib-2.0.def
Expand Down
4 changes: 2 additions & 2 deletions gobject/Makefile.am
Expand Up @@ -46,7 +46,7 @@ no_undefined = -no-undefined
endif

if OS_WIN32
export_symbols = -export-symbols $(srcdir)/gobject.def
export_symbols = -export-symbols gobject.def

install-libtool-import-lib:
# Don't put the bug compatibility entries in the import lib!
Expand All @@ -58,7 +58,7 @@ install-libtool-import-lib:
ar d .libs/libgobject-2.0.dll.a $$file; \
done
$(INSTALL) .libs/libgobject-2.0.dll.a $(DESTDIR)$(libdir)
$(INSTALL) $(srcdir)/gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def
$(INSTALL) gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def

uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgobject-2.0.dll.a $(DESTDIR)$(libdir)/gobject-2.0.def
Expand Down

0 comments on commit b687214

Please sign in to comment.