-DPCRE_STATIC
glib.def: glib.symbols
- $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def
+ $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /') > glib.def
if OS_LINUX
if HAVE_GNUC_VISIBILITY
EXTRA_DIST += \
makefile.msc.in \
glib.rc.in \
+ gen-iswide-table.py \
gen-unicode-tables.pl \
gen-script-table.pl \
glibconfig.h.win32.in \
gconvert.c \
gdataset.c \
gdatasetprivate.h \
- gdate.c \
+ gdate.c \
+ gdatetime.c \
gdir.c \
gerror.c \
gfileutils.c \
ghook.c \
ghostutils.c \
giochannel.c \
- gkeyfile.c \
+ gkeyfile.c \
glibintl.h \
glib_trace.h \
glist.c \
- gmain.c \
+ gmain-internal.h \
+ gmain.c \
gmappedfile.c \
gmarkup.c \
gmem.c \
gthreadprivate.h \
gthreadpool.c \
gtimer.c \
+ gtimezone.c \
gtree.c \
guniprop.c \
gutf8.c \
gprintf.c \
gprintfint.h
+if OS_UNIX
+libglib_2_0_la_SOURCES += glib-unix.c
+endif
EXTRA_libglib_2_0_la_SOURCES = \
giounix.c \
glib-object.h \
glib.h
+if OS_UNIX
+glibinclude_HEADERS += glib-unix.h
+endif
+
glibsubincludedir=$(includedir)/glib-2.0/glib
glibsubinclude_HEADERS = \
galloca.h \
gconvert.h \
gdataset.h \
gdate.h \
+ gdatetime.h \
gdir.h \
gerror.h \
gfileutils.h \
gthread.h \
gthreadpool.h \
gtimer.h \
+ gtimezone.h \
gtree.h \
gtypes.h \
gunicode.h \
- gurifuncs.h \
+ gurifuncs.h \
gutils.h \
gvarianttype.h \
gvariant.h \
echo "*** Old headers found in $(glibincludedir). You should remove the" ; \
echo "*** contents of this directory and type 'make install' again." ; \
false ; \
- fi
+ fi
uninstall-local: uninstall-ms-lib uninstall-def-file
pcre_inc =
endif
-libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib)
+libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(GLIB_RT_LIBS)
libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
if ENABLE_DTRACE
glib_probes.h: glib_probes.d Makefile
- $(DTRACE) -C -h -s $< -o $@.tmp
- sed -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
+ $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
+ @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
glib_probes.o: glib_probes.d Makefile
- $(DTRACE) -G -s $< -o $@
+ $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
BUILT_SOURCES += glib_probes.h glib_probes.o
CLEANFILES += glib_probes.h glib_probes.h.tmp
libglib_2_0_la_LIBADD += glib_probes.o
EXTRA_DIST += ${auto_config_binscripts}
CONFIGVARS = \
- "bindir" : "${bindir}", \
- "glib-version" : "${GLIB_VERSION}"
+ "bindir" : "${bindir}", \
+ "glib-version" : "${GLIB_VERSION}"
install-exec-hook:
for sf in ${auto_config_binscripts} ; do \
glib-2.0.lib: libglib-2.0.la glib.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs10/glib.vcxproj ../build/win32/vs10/glib.vcxproj.filters
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
../build/win32/vs9/glib.vcproj: $(top_srcdir)/build/win32/vs9/glib.vcprojin
for F in $(libglib_2_0_la_SOURCES); do \
case $$F in \
- *-gcc.c) \
+ *-gcc.c|*-unix.c) \
;; \
*.c) echo ' <File RelativePath="..\..\..\glib\'$$F'" />' \
;; \
esac; \
done >libglib.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib.vcprojin >$@
+ rm libglib.sourcefiles
+
+../build/win32/vs10/glib.vcxproj: $(top_srcdir)/build/win32/vs10/glib.vcxprojin
+ for F in $(libglib_2_0_la_SOURCES); do \
+ case $$F in \
+ *-gcc.c|*-unix.c) \
+ ;; \
+ *.c) echo ' <ClCompile Include="..\..\..\glib\'$$F'" />' \
+ ;; \
+ esac; \
+ done >libglib.vs10.sourcefiles
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxprojin >$@
+ rm libglib.vs10.sourcefiles
+
+../build/win32/vs10/glib.vcxproj.filters: $(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin
+ for F in $(libglib_2_0_la_SOURCES); do \
+ case $$F in \
+ *-gcc.c|*-unix.c) \
+ ;; \
+ *.c) echo ' <ClCompile Include="..\..\..\glib\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+ ;; \
+ esac; \
+ done >libglib.vs10.sourcefiles.filters
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin >$@
+ rm libglib.vs10.sourcefiles.filters
distclean-local:
if test $(srcdir) = .; then :; else \