diff options
Diffstat (limited to 'glib/Makefile.am')
| -rw-r--r-- | glib/Makefile.am | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/glib/Makefile.am b/glib/Makefile.am index 97861b8d7..049706126 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -9,15 +9,13 @@ include $(top_srcdir)/glib.mk # to config.status will not result in changes to glibconfig.h so we # avoid touching its timestamp (in order not to rebuild the whole tree). # -DISTCLEANFILES += glibconfig-stamp glibconfig.h glibconfig.h.win32 +DISTCLEANFILES += glibconfig-stamp glibconfig.h BUILT_SOURCES += glibconfig-stamp configexecincludedir = $(libdir)/glib-2.0/include nodist_configexecinclude_HEADERS = glibconfig.h glibconfig-stamp: ../config.status $(AM_V_GEN) cd $(top_builddir) && \ $(SHELL) ./config.status glib/glibconfig.h - $(AM_V_GEN) cd $(top_builddir) && \ - $(SHELL) ./config.status glib/glibconfig.h.win32 @touch glibconfig-stamp @@ -57,7 +55,6 @@ MIRRORING_TAB_SOURCE = \ EXTRA_DIST += \ glib.rc.in \ gen-unicode-tables.pl \ - glibconfig.h.win32.in \ gregex.c \ gregex.h \ win_iconv.c \ @@ -70,7 +67,6 @@ CLEANFILES += libglib-gdb.py # These may be in the builddir too BUILT_EXTRA_DIST += \ - glibconfig.h.win32 \ glib.rc lib_LTLIBRARIES = libglib-2.0.la @@ -458,19 +454,7 @@ glib.def: libglib-2.0.la glib-2.0.lib: libglib-2.0.la glib.def $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/glib.def -out:$@ -# ------ MSVC Project File Generation ------ -MSVCPROJS = glib - -glib_FILES = $(libglib_2_0_la_SOURCES) -glib_EXCLUDES = *-unix.c|gthread-*.c - -glib_HEADERS_DIR = $(glibsubincludedir) -glib_HEADERS_INST = $(deprecatedinclude_HEADERS) $(glibsubinclude_HEADERS) -glib_HEADERS_EXCLUDES = dummy - -include $(top_srcdir)/win32/Makefile.msvcproj - -dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/win32/vs9/glib.vcproj $(top_builddir)/win32/vs9/glib.headers +dist-hook: $(BUILT_EXTRA_DIST) files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ |