Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/lantw/build-Move-gtk.def-to-builddir' into 'gtk-2-24'

Browse Source 
build: Move gtk.def to builddir

See merge request GNOME/gtk!2481
This commit is contained in:
Emmanuele Bassi
2020-08-26 15:14:45 +00:00
parent b4c52486f5 f203b1a751
commit 2b3d65895b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/Makefile.am
View File

@@ -71,7 +71,7 @@ endif
if OS_WIN32
gtk_def = gtk.def
gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
gtk_win32_symbols = -export-symbols gtk.def
gtk_win32_res = gtk-win32-res.o
gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
@@ -81,7 +81,7 @@ gtk-win32-res.o : gtk-win32.rc
install-def-file: gtk.def
$(mkinstalldirs) $(DESTDIR)$(libdir)
$(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
$(INSTALL) gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
uninstall-def-file:
-rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def
else
@@ -106,10 +106,10 @@ install-ms-lib:
uninstall-ms-lib:
endif
# This places the generated .def file in srcdir, since it is expected to be there.
# (The one from a tarball is)
# gtk.def has to be put in builddir and should not be included in a source
# tarball because it differs in 32-bit and 64-bit Windows builds.
gtk.def: gtk.symbols
(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gtk.def
gtkalias.h: gtk.symbols
$(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
@@ -836,7 +836,7 @@ EXTRA_DIST += $(STOCK_ICONS)
#
# setup autogeneration dependencies
gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf
CLEANFILES = $(gen_sources)
CLEANFILES = $(gen_sources) $(gtk_def)
BUILT_SOURCES = $(gtk_built_sources)
@@ -1463,7 +1463,6 @@ EXTRA_DIST += \
tree_minus.xbm \
tree_minus.xpm \
tree_plus.xpm \
gtk.def \
gtk-builder-convert \
gtk-win32.rc \
gtk-win32.rc.in \