[gtk+] win32: Drop remnants of def files
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] win32: Drop remnants of def files
- Date: Sun, 22 Jun 2014 17:24:01 +0000 (UTC)
commit d76785a993aa71f880d5805d1c010d4d12000bc1
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jun 22 13:22:43 2014 -0400
win32: Drop remnants of def files
We no longer have .def files, so don't refer to them from the
win32 build machinery. Patch by Cilyan Olowen
gdk/Makefile.am | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 6adaa7a..d002a3f 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -194,8 +194,8 @@ endif # USE_QUARTZ
if USE_WIN32
libgdk_3_la_SOURCES += gdkkeynames.c
libgdk_3_la_LIBADD += win32/libgdk-win32.la
-libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
-libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
+libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
+libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
endif # USE_WIN32
if USE_BROADWAY
@@ -345,22 +345,11 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
endif # HAVE_INTROSPECTION
-if OS_WIN32
-install-def-file: gdk.def
- mkdir -p $(DESTDIR)$(libdir)
- $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
-uninstall-def-file:
- -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
-else
-install-def-file:
-uninstall-def-file:
-endif
-
if MS_LIB_AVAILABLE
noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
-gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
- lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)- LT_CURRENT_MINUS_AGE@.dll
-def:gdk.def -out:$@
+gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la
+ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)- LT_CURRENT_MINUS_AGE@.dll
-out:$@
install-ms-lib:
mkdir -p $(DESTDIR)$(libdir)
@@ -457,9 +446,9 @@ dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../buil
DISTCLEANFILES = gdkconfig.h stamp-gc-h
-install-data-local: install-ms-lib install-def-file
+install-data-local: install-ms-lib
-uninstall-local: uninstall-ms-lib uninstall-def-file
+uninstall-local: uninstall-ms-lib
rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h
# if srcdir!=builddir, clean out maintainer-clean files from builddir
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]