AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gdk/Makefile.am Current GNU tools do understand the PRIVATE keyword, so no

Browse Source 
2005-06-26  Tor Lillqvist  <tml@novell.com>

	* gdk/Makefile.am
	* gtk/Makefile.am: Current GNU tools do understand the PRIVATE
	keyword, so no need to remove those entries from the import
	library. libtool installs the .dll.a import library itself, so no
	need to do it here. Install the .def file.
This commit is contained in:
Tor Lillqvist 2005-06-26 19:01:33 +00:00 committed by Tor Lillqvist
parent 48b8ff47c1
commit 98a17d1462
5 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2005-06-26 Tor Lillqvist <tml@novell.com>
* gdk/Makefile.am
* gtk/Makefile.am: Current GNU tools do understand the PRIVATE
keyword, so no need to remove those entries from the import
library. libtool installs the .dll.a import library itself, so no
need to do it here. Install the .def file.
Sun Jun 26 00:04:36 2005 Manish Singh <yosh@gimp.org>
* gdk/gdkevents.c (gdk_event_get_time, gdk_event_get_state): add

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
2005-06-26 Tor Lillqvist <tml@novell.com>
* gdk/Makefile.am
* gtk/Makefile.am: Current GNU tools do understand the PRIVATE
keyword, so no need to remove those entries from the import
library. libtool installs the .dll.a import library itself, so no
need to do it here. Install the .def file.
Sun Jun 26 00:04:36 2005 Manish Singh <yosh@gimp.org>
* gdk/gdkevents.c (gdk_event_get_time, gdk_event_get_state): add

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
2005-06-26 Tor Lillqvist <tml@novell.com>
* gdk/Makefile.am
* gtk/Makefile.am: Current GNU tools do understand the PRIVATE
keyword, so no need to remove those entries from the import
library. libtool installs the .dll.a import library itself, so no
need to do it here. Install the .def file.
Sun Jun 26 00:04:36 2005 Manish Singh <yosh@gimp.org>
* gdk/gdkevents.c (gdk_event_get_time, gdk_event_get_state): add

16
gdk/Makefile.am
View File

@ -154,13 +154,13 @@ libgdk_win32_2_0_la_LIBADD += -Lwin32 -lie55uuid
endif
if OS_WIN32
install-libtool-import-lib:
$(INSTALL) .libs/libgdk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgdk-win32-$(GTK_API_VERSION).dll.a
install-def-file: gdk.def
$(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-2.0.def
uninstall-def-file:
-rm $(DESTDIR)$(libdir)/gdk-win32-2.0.def
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
install-def-file:
uninstall-def-file:
endif
if MS_LIB_AVAILABLE
@ -273,9 +273,9 @@ stamp-gc-h: $(top_builddir)/config.status
DISTCLEANFILES = gdkconfig.h stamp-gc-h
install-data-local: install-ms-lib install-libtool-import-lib
install-data-local: install-ms-lib install-def-file
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
uninstall-local: uninstall-ms-lib uninstall-def-file
rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h
# if srcdir!=builddir, clean out maintainer-clean files from builddir

20
gtk/Makefile.am
View File

@ -45,17 +45,13 @@ gtk_win32res_lo = gtk-win32res.lo
gtk-win32res.lo : gtk-win32.rc
$(top_srcdir)/build/win32/lt-compile-resource gtk-win32.rc gtk-win32res.lo
install-libtool-import-lib:
for entry in `grep PRIVATE gtk.def | sed -e 's/PRIVATE//'`; do \
file=`$(NM) -A .libs/libgtk-win32-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \
$(AR) d .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $$file; \
done
$(INSTALL) .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libtk-win32-$(GTK_API_VERSION).dll.a
install-def-file: gtk.def
$(INSTALL) $(gtk_def) $(DESTDIR)$(libdir)/gtk-win32-2.0.def
uninstall-def-file:
-rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
install-def-file:
uninstall-def-file:
endif
if MS_LIB_AVAILABLE
@ -680,7 +676,7 @@ if DISABLE_EXPLICIT_DEPS
endif
# Install a RC file for the default GTK+ theme, and key themes
install-data-local: install-ms-lib install-libtool-import-lib
install-data-local: install-ms-lib install-def-file
$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
$(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
@ -688,7 +684,7 @@ install-data-local: install-ms-lib install-libtool-import-lib
$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key
$(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
uninstall-local: uninstall-ms-lib uninstall-def-file
rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc