summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2012-04-05 05:46:51 -0700
committerDan Nicholson <dbn.lists@gmail.com>2012-04-21 12:46:31 -0700
commit7c54f7ca1e9e847a7bba7ede2c4696685af5822f (patch)
tree2735f5b6266c915a196b44f9ca25378c128754a0
parentc23f6a6ef365ad472e2c397558dc8bbe10fd709c (diff)
glib: Remove as many unneeded files as possible
We just want to be able to build glib from the within the pkg-config tree. Everything else is just extra weight and is better used from an actual glib checkout. Unnecessary files include: * documentation * translations * tests * ChangeLogs * non-autotools win32 build files * various other build and/or internal files
Diffstat
-rw-r--r--glib-patches/glib-only.patch361
-rw-r--r--glib-patches/patchlist1
-rw-r--r--glib/Makefile.am79
-rw-r--r--glib/configure.ac107
-rw-r--r--glib/glib/Makefile.am30
-rw-r--r--glib/glib/gnulib/Makefile.am3
6 files changed, 370 insertions, 211 deletions
diff --git a/glib-patches/glib-only.patch b/glib-patches/glib-only.patch
new file mode 100644
index 0000000..7adbc09
--- /dev/null
+++ b/glib-patches/glib-only.patch
@@ -0,0 +1,361 @@
1diff --git a/glib/Makefile.am b/glib/Makefile.am
2index f5c510d..95c71de 100644
3--- a/glib/Makefile.am
4+++ b/glib/Makefile.am
5@@ -6,10 +6,8 @@ include $(top_srcdir)/Makefile.decl
6
7 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
8
9-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
10-DIST_SUBDIRS = $(SUBDIRS) build
11-
12-bin_SCRIPTS = glib-gettextize
13+SUBDIRS = . m4macros glib
14+DIST_SUBDIRS = $(SUBDIRS)
15
16 AM_CPPFLAGS = \
17 -DG_LOG_DOMAIN=g_log_domain_glib \
18@@ -18,85 +16,18 @@ AM_CPPFLAGS = \
19 -DGLIB_COMPILATION
20
21 EXTRA_DIST += \
22- ChangeLog.pre-2-20 \
23- ChangeLog.pre-2-18 \
24- ChangeLog.pre-2-16 \
25- ChangeLog.pre-2-14 \
26- ChangeLog.pre-2-12 \
27- ChangeLog.pre-2-10 \
28- ChangeLog.pre-2-8 \
29- ChangeLog.pre-2-6 \
30- ChangeLog.pre-2-4 \
31- ChangeLog.pre-2-2 \
32- ChangeLog.pre-2-0 \
33- ChangeLog.pre-1-2 \
34- glib-zip.in \
35- NEWS.pre-1-3 \
36 acglib.m4 \
37- sanity_check \
38- README.commits \
39 README.in \
40- INSTALL.in \
41- README.win32 \
42- HACKING \
43- autogen.sh \
44 Makefile.decl \
45- mkinstalldirs \
46- makefile.msc \
47- msvc_recommended_pragmas.h \
48- config.h.win32.in \
49- po/po2tbl.sed.in \
50- glib-2.0.pc.in \
51- gobject-2.0.pc.in \
52- gmodule-2.0.pc.in \
53- gmodule-export-2.0.pc.in \
54- gmodule-no-export-2.0.pc.in \
55- gthread-2.0.pc.in \
56- gio-2.0.pc.in \
57- gio-unix-2.0.pc.in \
58- gio-windows-2.0.pc.in
59+ mkinstalldirs
60
61
62 # These may be in the builddir too
63 BUILT_EXTRA_DIST = \
64- README \
65- INSTALL \
66- ChangeLog \
67- config.h.win32 \
68- gtk-doc.make
69+ README
70
71 CONFIGURE_DEPENDENCIES = acglib.m4
72
73-ChangeLog:
74- $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
75- (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GLIB_2_20_0^^.. --stat) | fmt --split-only > $@.tmp \
76- && mv -f $@.tmp $@ \
77- || ($(RM) $@.tmp; \
78- echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
79- (test -f $@ || echo git-log is required to generate this file >> $@)); \
80- else \
81- test -f $@ || \
82- (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
83- echo A git checkout and git-log is required to generate this file >> $@); \
84- fi
85-
86-pkgconfigdir = $(libdir)/pkgconfig
87-pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc gio-2.0.pc
88-
89-if OS_UNIX
90-pkgconfig_DATA += gio-unix-2.0.pc
91-endif
92-
93-if OS_WIN32
94-pkgconfig_DATA += gio-windows-2.0.pc
95-endif
96-
97-$(pkgconfig_DATA): config.status
98-
99-# install mkinstalldirs for glib-gettextize's benefit
100-gettextdir = $(datadir)/glib-2.0/gettext
101-gettext_SCRIPTS = mkinstalldirs
102-
103 # build documentation when doing distcheck
104 DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode
105
106@@ -107,7 +38,7 @@ distclean-local: lcov-clean
107 rm -f $(BUILT_EXTRA_DIST); \
108 fi
109
110-.PHONY: files release sanity snapshot ChangeLog
111+.PHONY: files release sanity snapshot
112
113 files:
114 @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
115diff --git a/glib/configure.ac b/glib/configure.ac
116index 48868d2..ca862c5 100644
117--- a/glib/configure.ac
118+++ b/glib/configure.ac
119@@ -457,19 +457,6 @@ dnl
120 dnl gettext support
121 dnl
122
123-ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
124-AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
125-GLIB_GNU_GETTEXT
126-
127-if test "$gt_cv_have_gettext" != "yes" ; then
128- AC_MSG_ERROR([
129-*** You must have either have gettext support in your C library, or use the
130-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
131-])
132-fi
133-
134-LIBS="$INTLLIBS $LIBS"
135-
136 GETTEXT_PACKAGE=glib20
137 AC_SUBST(GETTEXT_PACKAGE)
138 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
139@@ -2555,35 +2542,6 @@ if test $cross_compiling = yes; then
140 fi
141 fi
142
143-dnl **************************
144-dnl *** Checks for gtk-doc ***
145-dnl **************************
146-
147-GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
148-
149-AC_ARG_ENABLE(man,
150- [AC_HELP_STRING([--enable-man],
151- [regenerate man pages from Docbook [default=no]])],enable_man=yes,
152- enable_man=no)
153-
154-if test "${enable_man}" != no; then
155-dnl
156-dnl Check for xsltproc
157-dnl
158-AC_PATH_PROG([XSLTPROC], [xsltproc])
159- if test -z "$XSLTPROC"; then
160- enable_man=no
161- fi
162-
163- dnl check for DocBook DTD and stylesheets in the local catalog.
164- JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
165- [DocBook XML DTD V4.1.2],,enable_man=no)
166- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
167- [DocBook XSL Stylesheets],,enable_man=no)
168-fi
169-
170-AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
171-
172 dnl
173 dnl Tracing
174 dnl
175@@ -3484,87 +3442,22 @@ AC_SUBST(gio_INCLUDES)
176
177
178 AC_CONFIG_FILES([
179-glib-2.0.pc
180-gmodule-2.0.pc
181-gmodule-export-2.0.pc
182-gmodule-no-export-2.0.pc
183-gthread-2.0.pc
184-gobject-2.0.pc
185-gio-2.0.pc
186-gio-unix-2.0.pc
187-gio-windows-2.0.pc
188-glib-zip
189-glib-gettextize
190 Makefile
191-build/Makefile
192-build/win32/Makefile
193-build/win32/dirent/Makefile
194-build/win32/vs9/Makefile
195-build/win32/vs10/Makefile
196 glib/Makefile
197-glib/glib.stp
198 glib/libcharset/Makefile
199 glib/gnulib/Makefile
200 glib/pcre/Makefile
201 glib/update-pcre/Makefile
202-glib/tests/Makefile
203-gmodule/Makefile
204-gmodule/gmoduleconf.h
205-gobject/Makefile
206-gobject/gobject.stp
207-gobject/glib-mkenums
208-gobject/tests/Makefile
209-gthread/Makefile
210-gio/Makefile
211-gio/gdbus-2.0/codegen/Makefile
212-gio/gdbus-2.0/codegen/config.py
213-gio/xdgmime/Makefile
214-gio/inotify/Makefile
215-gio/fen/Makefile
216-gio/fam/Makefile
217-gio/win32/Makefile
218-gio/tests/Makefile
219-gio/tests/gdbus-object-manager-example/Makefile
220-po/Makefile.in
221-docs/Makefile
222-docs/reference/Makefile
223-docs/reference/glib/Makefile
224-docs/reference/glib/version.xml
225-docs/reference/gobject/Makefile
226-docs/reference/gobject/version.xml
227-docs/reference/gio/Makefile
228-docs/reference/gio/gdbus-object-manager-example/Makefile
229-docs/reference/gio/version.xml
230-tests/Makefile
231-tests/gobject/Makefile
232-tests/refcount/Makefile
233 m4macros/Makefile
234 ])
235
236-AC_CONFIG_COMMANDS([chmod-scripts],
237-[chmod 0755 glib-zip
238-chmod 0755 glib-gettextize
239-chmod 0755 gobject/glib-mkenums])
240-
241 # we want to invoke this macro solely so that the config.status script
242 # and automake generated makefiles know about these generated files.
243 # They are only needed to distcheck the package
244 if false; then
245 AC_CONFIG_FILES([
246- INSTALL
247 README
248- config.h.win32
249- glib/glibconfig.h.win32
250- glib/makefile.msc
251 glib/glib.rc
252- gmodule/makefile.msc
253- gmodule/gmodule.rc
254- gobject/makefile.msc
255- gobject/gobject.rc
256- gthread/makefile.msc
257- gthread/gthread.rc
258- gio/gio.rc
259- tests/makefile.msc
260 ])
261 fi
262
263diff --git a/glib/glib/Makefile.am b/glib/glib/Makefile.am
264index ac73a8c..6fb3a34 100644
265--- a/glib/glib/Makefile.am
266+++ b/glib/glib/Makefile.am
267@@ -35,9 +35,9 @@ else
268 MAYBE_PCRE = pcre
269 endif
270
271-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
272+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
273
274-DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
275+DIST_SUBDIRS = libcharset gnulib pcre update-pcre
276
277 AM_CPPFLAGS = \
278 $(glib_INCLUDES) \
279@@ -53,7 +53,6 @@ glib.def: glib.symbols
280 if OS_LINUX
281 if HAVE_GNUC_VISIBILITY
282 TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
283-TESTS = abicheck.sh
284 endif
285 endif
286
287@@ -66,12 +65,10 @@ MIRRORING_TAB_SOURCE = \
288 # The compilation of GRegex can be disabled, but the source files must
289 # be distributed.
290 EXTRA_DIST += \
291- makefile.msc.in \
292 glib.rc.in \
293 gen-iswide-table.py \
294 gen-unicode-tables.pl \
295 gen-script-table.pl \
296- glibconfig.h.win32.in \
297 abicheck.sh \
298 glib.symbols \
299 gregex.c \
300@@ -86,8 +83,6 @@ CLEANFILES= libglib-gdb.py
301
302 # These may be in the builddir too
303 BUILT_EXTRA_DIST = \
304- makefile.msc \
305- glibconfig.h.win32 \
306 glib.rc
307
308 lib_LTLIBRARIES = libglib-2.0.la
309@@ -116,7 +111,6 @@ deprecated_sources = \
310
311 libglib_2_0_la_SOURCES = \
312 $(deprecated_sources) \
313- glib_probes.d \
314 garray.c \
315 gasyncqueue.c \
316 gasyncqueueprivate.h \
317@@ -382,24 +376,6 @@ libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
318
319 INSTALL_PROGS=
320
321-if ENABLE_DTRACE
322-glib_probes.h: glib_probes.d Makefile
323- $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
324- @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
325-glib_probes.o: glib_probes.d Makefile
326- $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
327-BUILT_SOURCES += glib_probes.h glib_probes.o
328-CLEANFILES += glib_probes.h glib_probes.h.tmp
329-libglib_2_0_la_LIBADD += glib_probes.o
330-endif
331-
332-if ENABLE_SYSTEMTAP
333-tapset_in_files = glib.stp.in
334-tapsetdir = @ABS_TAPSET_DIR@
335-tapset_DATA = $(tapset_in_files:.stp.in=.stp)
336-EXTRA_DIST += $(tapset_in_files)
337-endif
338-
339 gspawn-win32-helper-console.c:
340 echo '#define HELPER_CONSOLE' >$@
341 echo '#include "gspawn-win32-helper.c"' >>$@
342@@ -461,7 +437,7 @@ endif
343 glib-2.0.lib: libglib-2.0.la glib.def
344 lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/glib.def -out:$@
345
346-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs10/glib.vcxproj ../build/win32/vs10/glib.vcxproj.filters
347+dist-hook: $(BUILT_EXTRA_DIST)
348 files='$(BUILT_EXTRA_DIST)'; \
349 for f in $$files; do \
350 if test -f $$f; then d=.; else d=$(srcdir); fi; \
351diff --git a/glib/glib/gnulib/Makefile.am b/glib/glib/gnulib/Makefile.am
352index ae8283d..a8666ff 100644
353--- a/glib/glib/gnulib/Makefile.am
354+++ b/glib/glib/gnulib/Makefile.am
355@@ -17,6 +17,3 @@ libgnulib_la_SOURCES = \
356 printf.c \
357 printf.h \
358 g-gnulib.h
359-
360-
361-EXTRA_DIST += makefile.msc
diff --git a/glib-patches/patchlist b/glib-patches/patchlist
index e69de29..d188788 100644
--- a/glib-patches/patchlist
+++ b/glib-patches/patchlist
@@ -0,0 +1 @@
glib-only.patch
diff --git a/glib/Makefile.am b/glib/Makefile.am
index f5c510d..95c71de 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -6,10 +6,8 @@ include $(top_srcdir)/Makefile.decl
6 6
7ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} 7ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
8 8
9SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs 9SUBDIRS = . m4macros glib
10DIST_SUBDIRS = $(SUBDIRS) build 10DIST_SUBDIRS = $(SUBDIRS)
11
12bin_SCRIPTS = glib-gettextize
13 11
14AM_CPPFLAGS = \ 12AM_CPPFLAGS = \
15 -DG_LOG_DOMAIN=g_log_domain_glib \ 13 -DG_LOG_DOMAIN=g_log_domain_glib \
@@ -18,85 +16,18 @@ AM_CPPFLAGS = \
18 -DGLIB_COMPILATION 16 -DGLIB_COMPILATION
19 17
20EXTRA_DIST += \ 18EXTRA_DIST += \
21 ChangeLog.pre-2-20 \
22 ChangeLog.pre-2-18 \
23 ChangeLog.pre-2-16 \
24 ChangeLog.pre-2-14 \
25 ChangeLog.pre-2-12 \
26 ChangeLog.pre-2-10 \
27 ChangeLog.pre-2-8 \
28 ChangeLog.pre-2-6 \
29 ChangeLog.pre-2-4 \
30 ChangeLog.pre-2-2 \
31 ChangeLog.pre-2-0 \
32 ChangeLog.pre-1-2 \
33 glib-zip.in \
34 NEWS.pre-1-3 \
35 acglib.m4 \ 19 acglib.m4 \
36 sanity_check \
37 README.commits \
38 README.in \ 20 README.in \
39 INSTALL.in \
40 README.win32 \
41 HACKING \
42 autogen.sh \
43 Makefile.decl \ 21 Makefile.decl \
44 mkinstalldirs \ 22 mkinstalldirs
45 makefile.msc \
46 msvc_recommended_pragmas.h \
47 config.h.win32.in \
48 po/po2tbl.sed.in \
49 glib-2.0.pc.in \
50 gobject-2.0.pc.in \
51 gmodule-2.0.pc.in \
52 gmodule-export-2.0.pc.in \
53 gmodule-no-export-2.0.pc.in \
54 gthread-2.0.pc.in \
55 gio-2.0.pc.in \
56 gio-unix-2.0.pc.in \
57 gio-windows-2.0.pc.in
58 23
59 24
60# These may be in the builddir too 25# These may be in the builddir too
61BUILT_EXTRA_DIST = \ 26BUILT_EXTRA_DIST = \
62 README \ 27 README
63 INSTALL \
64 ChangeLog \
65 config.h.win32 \
66 gtk-doc.make
67 28
68CONFIGURE_DEPENDENCIES = acglib.m4 29CONFIGURE_DEPENDENCIES = acglib.m4
69 30
70ChangeLog:
71 $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
72 (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GLIB_2_20_0^^.. --stat) | fmt --split-only > $@.tmp \
73 && mv -f $@.tmp $@ \
74 || ($(RM) $@.tmp; \
75 echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
76 (test -f $@ || echo git-log is required to generate this file >> $@)); \
77 else \
78 test -f $@ || \
79 (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
80 echo A git checkout and git-log is required to generate this file >> $@); \
81 fi
82
83pkgconfigdir = $(libdir)/pkgconfig
84pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc gio-2.0.pc
85
86if OS_UNIX
87pkgconfig_DATA += gio-unix-2.0.pc
88endif
89
90if OS_WIN32
91pkgconfig_DATA += gio-windows-2.0.pc
92endif
93
94$(pkgconfig_DATA): config.status
95
96# install mkinstalldirs for glib-gettextize's benefit
97gettextdir = $(datadir)/glib-2.0/gettext
98gettext_SCRIPTS = mkinstalldirs
99
100# build documentation when doing distcheck 31# build documentation when doing distcheck
101DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode 32DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode
102 33
@@ -107,7 +38,7 @@ distclean-local: lcov-clean
107 rm -f $(BUILT_EXTRA_DIST); \ 38 rm -f $(BUILT_EXTRA_DIST); \
108 fi 39 fi
109 40
110.PHONY: files release sanity snapshot ChangeLog 41.PHONY: files release sanity snapshot
111 42
112files: 43files:
113 @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \ 44 @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
diff --git a/glib/configure.ac b/glib/configure.ac
index 48868d2..ca862c5 100644
--- a/glib/configure.ac
+++ b/glib/configure.ac
@@ -457,19 +457,6 @@ dnl
457dnl gettext support 457dnl gettext support
458dnl 458dnl
459 459
460ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
461AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
462GLIB_GNU_GETTEXT
463
464if test "$gt_cv_have_gettext" != "yes" ; then
465 AC_MSG_ERROR([
466*** You must have either have gettext support in your C library, or use the
467*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
468])
469fi
470
471LIBS="$INTLLIBS $LIBS"
472
473GETTEXT_PACKAGE=glib20 460GETTEXT_PACKAGE=glib20
474AC_SUBST(GETTEXT_PACKAGE) 461AC_SUBST(GETTEXT_PACKAGE)
475AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], 462AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
@@ -2555,35 +2542,6 @@ if test $cross_compiling = yes; then
2555 fi 2542 fi
2556fi 2543fi
2557 2544
2558dnl **************************
2559dnl *** Checks for gtk-doc ***
2560dnl **************************
2561
2562GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
2563
2564AC_ARG_ENABLE(man,
2565 [AC_HELP_STRING([--enable-man],
2566 [regenerate man pages from Docbook [default=no]])],enable_man=yes,
2567 enable_man=no)
2568
2569if test "${enable_man}" != no; then
2570dnl
2571dnl Check for xsltproc
2572dnl
2573AC_PATH_PROG([XSLTPROC], [xsltproc])
2574 if test -z "$XSLTPROC"; then
2575 enable_man=no
2576 fi
2577
2578 dnl check for DocBook DTD and stylesheets in the local catalog.
2579 JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
2580 [DocBook XML DTD V4.1.2],,enable_man=no)
2581 JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
2582 [DocBook XSL Stylesheets],,enable_man=no)
2583fi
2584
2585AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
2586
2587dnl 2545dnl
2588dnl Tracing 2546dnl Tracing
2589dnl 2547dnl
@@ -3484,87 +3442,22 @@ AC_SUBST(gio_INCLUDES)
3484 3442
3485 3443
3486AC_CONFIG_FILES([ 3444AC_CONFIG_FILES([
3487glib-2.0.pc
3488gmodule-2.0.pc
3489gmodule-export-2.0.pc
3490gmodule-no-export-2.0.pc
3491gthread-2.0.pc
3492gobject-2.0.pc
3493gio-2.0.pc
3494gio-unix-2.0.pc
3495gio-windows-2.0.pc
3496glib-zip
3497glib-gettextize
3498Makefile 3445Makefile
3499build/Makefile
3500build/win32/Makefile
3501build/win32/dirent/Makefile
3502build/win32/vs9/Makefile
3503build/win32/vs10/Makefile
3504glib/Makefile 3446glib/Makefile
3505glib/glib.stp
3506glib/libcharset/Makefile 3447glib/libcharset/Makefile
3507glib/gnulib/Makefile 3448glib/gnulib/Makefile
3508glib/pcre/Makefile 3449glib/pcre/Makefile
3509glib/update-pcre/Makefile 3450glib/update-pcre/Makefile
3510glib/tests/Makefile
3511gmodule/Makefile
3512gmodule/gmoduleconf.h
3513gobject/Makefile
3514gobject/gobject.stp
3515gobject/glib-mkenums
3516gobject/tests/Makefile
3517gthread/Makefile
3518gio/Makefile
3519gio/gdbus-2.0/codegen/Makefile
3520gio/gdbus-2.0/codegen/config.py
3521gio/xdgmime/Makefile
3522gio/inotify/Makefile
3523gio/fen/Makefile
3524gio/fam/Makefile
3525gio/win32/Makefile
3526gio/tests/Makefile
3527gio/tests/gdbus-object-manager-example/Makefile
3528po/Makefile.in
3529docs/Makefile
3530docs/reference/Makefile
3531docs/reference/glib/Makefile
3532docs/reference/glib/version.xml
3533docs/reference/gobject/Makefile
3534docs/reference/gobject/version.xml
3535docs/reference/gio/Makefile
3536docs/reference/gio/gdbus-object-manager-example/Makefile
3537docs/reference/gio/version.xml
3538tests/Makefile
3539tests/gobject/Makefile
3540tests/refcount/Makefile
3541m4macros/Makefile 3451m4macros/Makefile
3542]) 3452])
3543 3453
3544AC_CONFIG_COMMANDS([chmod-scripts],
3545[chmod 0755 glib-zip
3546chmod 0755 glib-gettextize
3547chmod 0755 gobject/glib-mkenums])
3548
3549# we want to invoke this macro solely so that the config.status script 3454# we want to invoke this macro solely so that the config.status script
3550# and automake generated makefiles know about these generated files. 3455# and automake generated makefiles know about these generated files.
3551# They are only needed to distcheck the package 3456# They are only needed to distcheck the package
3552if false; then 3457if false; then
3553 AC_CONFIG_FILES([ 3458 AC_CONFIG_FILES([
3554 INSTALL
3555 README 3459 README
3556 config.h.win32
3557 glib/glibconfig.h.win32
3558 glib/makefile.msc
3559 glib/glib.rc 3460 glib/glib.rc
3560 gmodule/makefile.msc
3561 gmodule/gmodule.rc
3562 gobject/makefile.msc
3563 gobject/gobject.rc
3564 gthread/makefile.msc
3565 gthread/gthread.rc
3566 gio/gio.rc
3567 tests/makefile.msc
3568 ]) 3461 ])
3569fi 3462fi
3570 3463
diff --git a/glib/glib/Makefile.am b/glib/glib/Makefile.am
index ac73a8c..6fb3a34 100644
--- a/glib/glib/Makefile.am
+++ b/glib/glib/Makefile.am
@@ -35,9 +35,9 @@ else
35MAYBE_PCRE = pcre 35MAYBE_PCRE = pcre
36endif 36endif
37 37
38SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests 38SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre .
39 39
40DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests 40DIST_SUBDIRS = libcharset gnulib pcre update-pcre
41 41
42AM_CPPFLAGS = \ 42AM_CPPFLAGS = \
43 $(glib_INCLUDES) \ 43 $(glib_INCLUDES) \
@@ -53,7 +53,6 @@ glib.def: glib.symbols
53if OS_LINUX 53if OS_LINUX
54if HAVE_GNUC_VISIBILITY 54if HAVE_GNUC_VISIBILITY
55TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)" 55TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
56TESTS = abicheck.sh
57endif 56endif
58endif 57endif
59 58
@@ -66,12 +65,10 @@ MIRRORING_TAB_SOURCE = \
66# The compilation of GRegex can be disabled, but the source files must 65# The compilation of GRegex can be disabled, but the source files must
67# be distributed. 66# be distributed.
68EXTRA_DIST += \ 67EXTRA_DIST += \
69 makefile.msc.in \
70 glib.rc.in \ 68 glib.rc.in \
71 gen-iswide-table.py \ 69 gen-iswide-table.py \
72 gen-unicode-tables.pl \ 70 gen-unicode-tables.pl \
73 gen-script-table.pl \ 71 gen-script-table.pl \
74 glibconfig.h.win32.in \
75 abicheck.sh \ 72 abicheck.sh \
76 glib.symbols \ 73 glib.symbols \
77 gregex.c \ 74 gregex.c \
@@ -86,8 +83,6 @@ CLEANFILES= libglib-gdb.py
86 83
87# These may be in the builddir too 84# These may be in the builddir too
88BUILT_EXTRA_DIST = \ 85BUILT_EXTRA_DIST = \
89 makefile.msc \
90 glibconfig.h.win32 \
91 glib.rc 86 glib.rc
92 87
93lib_LTLIBRARIES = libglib-2.0.la 88lib_LTLIBRARIES = libglib-2.0.la
@@ -116,7 +111,6 @@ deprecated_sources = \
116 111
117libglib_2_0_la_SOURCES = \ 112libglib_2_0_la_SOURCES = \
118 $(deprecated_sources) \ 113 $(deprecated_sources) \
119 glib_probes.d \
120 garray.c \ 114 garray.c \
121 gasyncqueue.c \ 115 gasyncqueue.c \
122 gasyncqueueprivate.h \ 116 gasyncqueueprivate.h \
@@ -382,24 +376,6 @@ libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
382 376
383INSTALL_PROGS= 377INSTALL_PROGS=
384 378
385if ENABLE_DTRACE
386glib_probes.h: glib_probes.d Makefile
387 $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
388 @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
389glib_probes.o: glib_probes.d Makefile
390 $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
391BUILT_SOURCES += glib_probes.h glib_probes.o
392CLEANFILES += glib_probes.h glib_probes.h.tmp
393libglib_2_0_la_LIBADD += glib_probes.o
394endif
395
396if ENABLE_SYSTEMTAP
397tapset_in_files = glib.stp.in
398tapsetdir = @ABS_TAPSET_DIR@
399tapset_DATA = $(tapset_in_files:.stp.in=.stp)
400EXTRA_DIST += $(tapset_in_files)
401endif
402
403gspawn-win32-helper-console.c: 379gspawn-win32-helper-console.c:
404 echo '#define HELPER_CONSOLE' >$@ 380 echo '#define HELPER_CONSOLE' >$@
405 echo '#include "gspawn-win32-helper.c"' >>$@ 381 echo '#include "gspawn-win32-helper.c"' >>$@
@@ -461,7 +437,7 @@ endif
461glib-2.0.lib: libglib-2.0.la glib.def 437glib-2.0.lib: libglib-2.0.la glib.def
462 lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/glib.def -out:$@ 438 lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/glib.def -out:$@
463 439
464dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs10/glib.vcxproj ../build/win32/vs10/glib.vcxproj.filters 440dist-hook: $(BUILT_EXTRA_DIST)
465 files='$(BUILT_EXTRA_DIST)'; \ 441 files='$(BUILT_EXTRA_DIST)'; \
466 for f in $$files; do \ 442 for f in $$files; do \
467 if test -f $$f; then d=.; else d=$(srcdir); fi; \ 443 if test -f $$f; then d=.; else d=$(srcdir); fi; \
diff --git a/glib/glib/gnulib/Makefile.am b/glib/glib/gnulib/Makefile.am
index ae8283d..a8666ff 100644
--- a/glib/glib/gnulib/Makefile.am
+++ b/glib/glib/gnulib/Makefile.am
@@ -17,6 +17,3 @@ libgnulib_la_SOURCES = \
17 printf.c \ 17 printf.c \
18 printf.h \ 18 printf.h \
19 g-gnulib.h 19 g-gnulib.h
20
21
22EXTRA_DIST += makefile.msc
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 10:35:19 +0000