X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2FMakefile.am;h=d0da7b21a9939fa4b2cc6c82be8a76d91bfba730;hb=2fb57ff46f32316e991ab9f99daa5fce4885f097;hp=6c53e176b96df52dbce8e6b270cb3c63aff90c07;hpb=701ac3cb3d7a603697570f085457af7e68d089fd;p=platform%2Fupstream%2Fglib.git

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 6c53e17..d0da7b2 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -62,7 +62,7 @@ AM_CPPFLAGS = 				\
 	-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
@@ -82,6 +82,7 @@ MIRRORING_TAB_SOURCE = 				\
 EXTRA_DIST += 			\
 	makefile.msc.in		\
 	glib.rc.in		\
+	gen-iswide-table.py	\
 	gen-unicode-tables.pl	\
 	gen-script-table.pl	\
 	glibconfig.h.win32.in	\
@@ -147,6 +148,7 @@ libglib_2_0_la_SOURCES = 	\
 	glibintl.h		\
 	glib_trace.h		\
 	glist.c			\
+	gmain-internal.h	\
 	gmain.c	 		\
 	gmappedfile.c		\
 	gmarkup.c		\
@@ -206,6 +208,9 @@ libglib_2_0_la_SOURCES = 	\
 	gprintf.c		\
 	gprintfint.h
 
+if OS_UNIX
+libglib_2_0_la_SOURCES += glib-unix.c
+endif	
 
 EXTRA_libglib_2_0_la_SOURCES = \
 	giounix.c	\
@@ -219,6 +224,10 @@ glibinclude_HEADERS =   \
 	glib-object.h	\
 	glib.h
 
+if OS_UNIX
+glibinclude_HEADERS += glib-unix.h
+endif
+
 glibsubincludedir=$(includedir)/glib-2.0/glib
 glibsubinclude_HEADERS =   \
 	galloca.h	\
@@ -346,10 +355,10 @@ INSTALL_PROGS=
 
 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
@@ -432,7 +441,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs1
 ../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'" />' \
 			;; \
@@ -444,7 +453,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs1
 ../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) \
+		*-gcc.c|*-unix.c) \
 			;; \
 		*.c) echo '    <ClCompile Include="..\..\..\glib\'$$F'" />' \
 		     ;; \
@@ -452,11 +461,11 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs1
 	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) \
+		*-gcc.c|*-unix.c) \
 			;; \
 		*.c) echo '    <ClCompile Include="..\..\..\glib\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
 		     ;; \