projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Add SipHash algorithm
[platform/upstream/glib.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
cc4faca
..
a1c9c33
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,16
+1,20
@@
## Process this file with automake to produce Makefile.in
## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/
Makefile.decl
+include $(top_srcdir)/
glib.mk
# http://people.gnome.org/~walters/docs/build-api.txt
.buildapi-allow-builddir:
ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
# http://people.gnome.org/~walters/docs/build-api.txt
.buildapi-allow-builddir:
ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
-SUBDIRS = . m4macros glib gmodule gthread gobject gio
tests po doc
s
+SUBDIRS = . m4macros glib gmodule gthread gobject gio
po docs test
s
DIST_SUBDIRS = $(SUBDIRS) build
bin_SCRIPTS = glib-gettextize
DIST_SUBDIRS = $(SUBDIRS) build
bin_SCRIPTS = glib-gettextize
+if OS_LINUX
+TESTS += check-abis.sh
+endif
+
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=g_log_domain_glib \
@GLIB_DEBUG_FLAGS@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=g_log_domain_glib \
@GLIB_DEBUG_FLAGS@ \
@@
-36,12
+40,15
@@
EXTRA_DIST += \
sanity_check \
README.commits \
README.in \
sanity_check \
README.commits \
README.in \
+ README.rationale \
INSTALL.in \
README.win32 \
HACKING \
autogen.sh \
INSTALL.in \
README.win32 \
HACKING \
autogen.sh \
- Makefile.decl \
- mkinstalldirs \
+ glib.mk \
+ glib-tap.mk \
+ tap-driver.sh \
+ tap-test \
makefile.msc \
msvc_recommended_pragmas.h \
config.h.win32.in \
makefile.msc \
msvc_recommended_pragmas.h \
config.h.win32.in \
@@
-55,22
+62,18
@@
EXTRA_DIST += \
gio-2.0.pc.in \
gio-unix-2.0.pc.in \
gio-windows-2.0.pc.in \
gio-2.0.pc.in \
gio-unix-2.0.pc.in \
gio-windows-2.0.pc.in \
- glib-2.0-uninstalled.pc.in \
- gobject-2.0-uninstalled.pc.in \
- gmodule-2.0-uninstalled.pc.in \
- gthread-2.0-uninstalled.pc.in \
- gmodule-no-export-2.0-uninstalled.pc.in \
- gio-2.0-uninstalled.pc.in \
- gio-unix-2.0-uninstalled.pc.in
+ check-abis.sh \
+ gtk-doc.make \
+ $(NULL)
# These may be in the builddir too
# These may be in the builddir too
-BUILT_EXTRA_DIST
=
\
+BUILT_EXTRA_DIST
+=
\
README \
INSTALL \
ChangeLog \
config.h.win32 \
README \
INSTALL \
ChangeLog \
config.h.win32 \
- gtk-doc.make
+ $(NULL)
CONFIGURE_DEPENDENCIES = acglib.m4
CONFIGURE_DEPENDENCIES = acglib.m4
@@
-100,14
+103,10
@@
endif
$(pkgconfig_DATA): config.status
$(pkgconfig_DATA): config.status
-# install mkinstalldirs for glib-gettextize's benefit
-gettextdir = $(datadir)/glib-2.0/gettext
-gettext_SCRIPTS = mkinstalldirs
-
# build documentation when doing distcheck
DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode
# build documentation when doing distcheck
DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode
-DISTCLEANFILES = config.lt
+DISTCLEANFILES
+
= config.lt
distclean-local: lcov-clean
if test $(srcdir) = .; then :; else \
distclean-local: lcov-clean
if test $(srcdir) = .; then :; else \