mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-24 22:46:15 +01:00
Replace INCLUDES by AM_CPPFLAGS, other cleanups.
2007-11-24 Matthias Clasen <mclasen@redhat.com> * */Makefile.am: Replace INCLUDES by AM_CPPFLAGS, other cleanups. svn path=/trunk/; revision=5932
This commit is contained in:
parent
ed1afd7772
commit
0c01c6f1ad
@ -1,3 +1,8 @@
|
||||
2007-11-24 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* */Makefile.am: Replace INCLUDES by AM_CPPFLAGS, other
|
||||
cleanups.
|
||||
|
||||
2007-11-24 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* tests/base64-test.c: Fix a memory overrun.
|
||||
|
@ -7,8 +7,11 @@ SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
|
||||
|
||||
bin_SCRIPTS = glib-gettextize
|
||||
|
||||
INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
|
||||
-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
|
||||
AM_CPPFLAGS = \
|
||||
-DG_LOG_DOMAIN=g_log_domain_glib \
|
||||
@GLIB_DEBUG_FLAGS@ \
|
||||
-DG_DISABLE_DEPRECATED \
|
||||
-DGLIB_COMPILATION
|
||||
|
||||
EXTRA_DIST += \
|
||||
ChangeLog.pre-2-14 \
|
||||
|
@ -23,8 +23,13 @@ SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
|
||||
|
||||
DIST_SUBDIRS = libcharset gnulib pcre update-pcre
|
||||
|
||||
INCLUDES = -I$(top_srcdir) $(pcre_inc) -DG_LOG_DOMAIN=\"GLib\" \
|
||||
$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION \
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
$(pcre_inc) \
|
||||
-DG_LOG_DOMAIN=\"GLib\" \
|
||||
$(GLIB_DEBUG_FLAGS) \
|
||||
-DG_DISABLE_DEPRECATED \
|
||||
-DGLIB_COMPILATION \
|
||||
-DPCRE_STATIC
|
||||
|
||||
glib.def: glib.symbols
|
||||
|
@ -1,21 +1,26 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
|
||||
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule \
|
||||
-DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/glib \
|
||||
-I$(top_srcdir)/gmodule \
|
||||
-DG_LOG_DOMAIN=\"GModule\" \
|
||||
@GLIB_DEBUG_FLAGS@ \
|
||||
-DG_DISABLE_DEPRECATED
|
||||
|
||||
EXTRA_DIST += \
|
||||
makefile.msc.in \
|
||||
gmoduleconf.h.in \
|
||||
gmodule.def \
|
||||
gmodule-dl.c \
|
||||
gmodule-dld.c \
|
||||
gmodule-dyld.c \
|
||||
gmodule-os2.c \
|
||||
gmodule-win32.c \
|
||||
gmodule-beos.c \
|
||||
gmodule-ar.c \
|
||||
gmoduleconf.h.win32 \
|
||||
EXTRA_DIST += \
|
||||
makefile.msc.in \
|
||||
gmoduleconf.h.in \
|
||||
gmodule.def \
|
||||
gmodule-dl.c \
|
||||
gmodule-dld.c \
|
||||
gmodule-dyld.c \
|
||||
gmodule-os2.c \
|
||||
gmodule-win32.c \
|
||||
gmodule-beos.c \
|
||||
gmodule-ar.c \
|
||||
gmoduleconf.h.win32 \
|
||||
gmodule.rc.in
|
||||
|
||||
BUILT_EXTRA_DIST = \
|
||||
|
@ -4,7 +4,7 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
|
||||
INCLUDES = \
|
||||
AM_CPPFLAGS = \
|
||||
-DG_LOG_DOMAIN=\"GLib-GObject\" \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/glib \
|
||||
|
@ -1,9 +1,14 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
|
||||
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gthread \
|
||||
-DG_LOG_DOMAIN=\"GThread\" @GTHREAD_COMPILE_IMPL_DEFINES@ \
|
||||
@GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/glib \
|
||||
-I$(top_srcdir)/gthread \
|
||||
-DG_LOG_DOMAIN=\"GThread\" \
|
||||
@GTHREAD_COMPILE_IMPL_DEFINES@ \
|
||||
@GLIB_DEBUG_FLAGS@ \
|
||||
-DG_DISABLE_DEPRECATED
|
||||
|
||||
EXTRA_DIST += \
|
||||
makefile.msc.in \
|
||||
@ -13,7 +18,7 @@ EXTRA_DIST += \
|
||||
gthread.def \
|
||||
gthread.rc.in
|
||||
|
||||
BUILT_EXTRA_DIST = \
|
||||
BUILT_EXTRA_DIST = \
|
||||
makefile.msc \
|
||||
gthread.rc
|
||||
|
||||
|
@ -8,7 +8,14 @@ else
|
||||
enable_regex =
|
||||
endif
|
||||
|
||||
INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule $(GLIB_DEBUG_FLAGS) $(enable_regex)
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/glib \
|
||||
-I$(top_srcdir)/gmodule \
|
||||
$(GLIB_DEBUG_FLAGS) \
|
||||
$(enable_regex)
|
||||
|
||||
AM_CFLAGS = -g
|
||||
|
||||
EFENCE=
|
||||
|
||||
@ -58,7 +65,15 @@ endif
|
||||
if ENABLE_TIMELOOP
|
||||
timeloop = timeloop timeloop-closure
|
||||
endif
|
||||
noinst_PROGRAMS = testglib testgdate testgdateparser unicode-normalize unicode-collate $(timeloop) errorcheck-mutex-test
|
||||
noinst_PROGRAMS = \
|
||||
testglib \
|
||||
testgdate \
|
||||
testgdateparser \
|
||||
unicode-normalize \
|
||||
unicode-collate \
|
||||
$(timeloop) \
|
||||
errorcheck-mutex-test
|
||||
|
||||
testglib_LDADD = $(libglib)
|
||||
patterntest_LDADD = $(libglib)
|
||||
testgdate_LDADD = $(libglib)
|
||||
@ -217,22 +232,23 @@ libmoduletestplugin_b_la_LDFLAGS = $(G_MODULE_LDFLAGS) -avoid-version -module $(
|
||||
libmoduletestplugin_b_la_LIBADD = $(G_MODULE_LIBS) $(libadd_libgmodule) $(libadd_libglib)
|
||||
|
||||
dist-hook: $(BUILT_EXTRA_DIST)
|
||||
files='$(BUILT_EXTRA_DIST)'; \
|
||||
for f in $$files; do \
|
||||
if test -f $$f; then d=.; else d=$(srcdir); fi; \
|
||||
files='$(BUILT_EXTRA_DIST)'; \
|
||||
for f in $$files; do \
|
||||
if test -f $$f; then d=.; else d=$(srcdir); fi; \
|
||||
cp $$d/$$f $(distdir) || exit 1; done
|
||||
mkdir $(distdir)/markups; \
|
||||
for f in $(srcdir)/markups/* ; do \
|
||||
mkdir $(distdir)/markups; \
|
||||
for f in $(srcdir)/markups/* ; do \
|
||||
cp $$f $(distdir)/markups; done
|
||||
mkdir $(distdir)/collate; \
|
||||
for f in $(srcdir)/collate/* ; do \
|
||||
mkdir $(distdir)/collate; \
|
||||
for f in $(srcdir)/collate/* ; do \
|
||||
if test -f $$f; then cp $$f $(distdir)/collate; fi; done
|
||||
mkdir $(distdir)/bookmarks; \
|
||||
for f in $(srcdir)/bookmarks/* ; do \
|
||||
mkdir $(distdir)/bookmarks; \
|
||||
for f in $(srcdir)/bookmarks/* ; do \
|
||||
cp $$f $(distdir)/bookmarks; done
|
||||
|
||||
DISTCLEANFILES = iochannel-test-outfile \
|
||||
file-test-get-contents \
|
||||
maptest \
|
||||
mapchild \
|
||||
collate.out
|
||||
DISTCLEANFILES = \
|
||||
iochannel-test-outfile \
|
||||
file-test-get-contents \
|
||||
maptest \
|
||||
mapchild \
|
||||
collate.out
|
||||
|
Loading…
Reference in New Issue
Block a user