luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-09 19:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace -I with $(glib_INCLUDES) and friends

Browse Source 
Stop using ad hoc -I in all of our Makefile.am.  Use the new variables
instead.
This commit is contained in:
Ryan Lortie 2010-08-06 13:09:26 -04:00
parent 8ad9d9dbe3
commit b3b7ea8e22
23 changed files with 23 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/reference/gio/Makefile.am
View File

@ -116,15 +116,7 @@ IGNORE_HFILES= \
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
-I$(srcdir) \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gobject \
-I$(top_srcdir)/gio \
-I$(top_builddir) \
-I$(top_builddir)/glib \
-I$(top_builddir)/gobject \
-I$(top_builddir)/gio \
$(gio_INCLUDES) \
$(GLIB_DEBUG_FLAGS)
GTKDOC_LIBS = \

5
docs/reference/gobject/Makefile.am
View File

@ -32,10 +32,7 @@ IGNORE_HFILES = \
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
-I$(srcdir) \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_builddir) \
-I$(top_builddir)/glib \
$(gobject_INCLUDES) \
$(GLIB_DEBUG_FLAGS)
GTKDOC_LIBS = \
$(top_builddir)/glib/libglib-2.0.la \

6
gio/Makefile.am
View File

@ -39,11 +39,7 @@ endif
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"GLib-GIO\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \
-I$(top_builddir)/glib \
$(gmodule_INCLUDES) \
$(GLIB_DEBUG_FLAGS) \
$(THREAD_FLAGS) \
-DG_DISABLE_DEPRECATED \

5
gio/fam/Makefile.am
View File

@ -19,10 +19,7 @@ libgiofam_la_SOURCES = \
libgiofam_la_CFLAGS = \
-DG_LOG_DOMAIN=\"GLib-GIO\" \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \
-I$(top_srcdir)/gio \
$(gio_INCLUDES) \
$(GLIB_DEBUG_FLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGIO_COMPILATION \

6
gio/fen/Makefile.am
View File

@ -21,11 +21,7 @@ libfen_la_SOURCES = \
libfen_la_CFLAGS = \
-DG_LOG_DOMAIN=\"GLib-GIO\" \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \
-I$(top_srcdir)/gio \
-I$(top_builddir)/gio \
$(gio_INCLUDES) \
$(GLIB_DEBUG_FLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGIO_COMPILATION \

6
gio/inotify/Makefile.am
View File

@ -25,11 +25,7 @@ libinotify_la_SOURCES = \
libinotify_la_CFLAGS = \
-DG_LOG_DOMAIN=\"GLib-GIO\" \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \
-I$(top_srcdir)/gio \
-I$(top_builddir)/gio \
$(gio_INCLUDES) \
$(GLIB_DEBUG_FLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGIO_COMPILATION \

2
gio/libasyncns/Makefile.am
View File

@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
INCLUDES = -I$(top_srcdir)
INCLUDES = $(config_h_INCLUDES)
noinst_LTLIBRARIES = libasyncns.la

7
gio/tests/Makefile.am
View File

@ -4,12 +4,7 @@ include $(top_srcdir)/Makefile.decl
INCLUDES = \
-g \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \
-I$(top_srcdir)/gobject \
-I$(top_srcdir)/gio \
-I$(top_builddir)/glib \
$(gio_INCLUDES) \
$(GLIB_DEBUG_FLAGS) \
-DSRCDIR=\""$(srcdir)"\"

6
gio/win32/Makefile.am
View File

@ -20,11 +20,7 @@ libgiowin32_la_SOURCES = \
libgiowin32_la_CFLAGS = \
-DG_LOG_DOMAIN=\"GLib-GIO\" \
-I$(top_builddir)/gio \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \
-I$(top_srcdir)/gio \
$(gio_INCLUDES) \
$(GLIB_DEBUG_FLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGIO_COMPILATION \

2
glib/Makefile.am
View File

@ -53,7 +53,7 @@ SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(glib_INCLUDES) \
$(pcre_inc) \
-DG_LOG_DOMAIN=\"GLib\" \
$(GLIB_DEBUG_FLAGS) \

3
glib/gnulib/Makefile.am
View File

@ -1,8 +1,7 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_builddir)/glib \
-DG_LOG_DOMAIN=\"GLib\" \
INCLUDES = $(glib_INCLUDES) -DG_LOG_DOMAIN=\"GLib\" \
$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
noinst_LTLIBRARIES = libgnulib.la

2
glib/libcharset/Makefile.am
View File

@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.decl
INCLUDES = \
-DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
-DLIBDIR=\"$(libdir)\" $(config_h_INCLUDES)
noinst_LTLIBRARIES = libcharset.la

5
glib/pcre/Makefile.am
View File

@ -13,10 +13,7 @@ INCLUDES = \
-DLINK_SIZE=2 \
-DPOSIX_MALLOC_THRESHOLD=10 \
-DPCRE_STATIC \
-I$(top_srcdir) \
-I$(srcdir) \
-I$(top_srcdir)/glib \
-I$(top_builddir)/glib \
$(glib_INCLUDES) \
@GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED \
-DGLIB_COMPILATION \

4
glib/tests/Makefile.am
View File

@ -2,9 +2,7 @@ include $(top_srcdir)/Makefile.decl
INCLUDES = \
-g \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_builddir)/glib \
$(glib_INCLUDES) \
-DSRCDIR=\""$(srcdir)"\" \
$(GLIB_DEBUG_FLAGS)

4
glib/update-pcre/Makefile.am-1
View File

@ -12,9 +12,7 @@ INCLUDES = \
-DEBCDIC=0 \
-DPOSIX_MALLOC_THRESHOLD=10 \
-DPCRE_STATIC \
-I$(top_srcdir) \
-I$(srcdir) \
-I$(top_srcdir)/glib \
$(glib_INCLUDES) \
@GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED \
-DGLIB_COMPILATION \

5
gmodule/Makefile.am
View File

@ -2,10 +2,7 @@
include $(top_srcdir)/Makefile.decl
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \
-I$(top_builddir)/glib \
$(glib_INCLUDES) \
-DG_LOG_DOMAIN=\"GModule\" \
@GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED

5
gobject/Makefile.am
View File

@ -14,10 +14,7 @@ endif
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"GLib-GObject\" \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_builddir) \
-I$(top_builddir)/glib \
$(gthread_INCLUDES) \
$(GLIB_DEBUG_FLAGS) \
$(THREAD_FLAGS) \
-DG_DISABLE_DEPRECATED \

2
gobject/tests/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_builddir)/glib $(GLIB_DEBUG_FLAGS)
INCLUDES = -g $(gobject_INCLUDES) $(GLIB_DEBUG_FLAGS)
noinst_PROGRAMS = $(TEST_PROGS)
libgobject_LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la

5
gthread/Makefile.am
View File

@ -5,10 +5,7 @@ SUBDIRS = . tests
DIST_SUBDIRS = tests
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gthread \
-I$(top_builddir)/glib \
$(glib_INCLUDES) \
-DG_LOG_DOMAIN=\"GThread\" \
@GTHREAD_COMPILE_IMPL_DEFINES@ \
@GLIB_DEBUG_FLAGS@ \

2
gthread/tests/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_builddir)/glib $(GLIB_DEBUG_FLAGS)
INCLUDES = -g $(gthread_INCLUDES) $(GLIB_DEBUG_FLAGS)
noinst_PROGRAMS = $(TEST_PROGS)
progs_ldadd = $(top_builddir)/glib/libglib-2.0.la \

5
tests/Makefile.am
View File

@ -3,10 +3,7 @@ include $(top_srcdir)/Makefile.decl
SUBDIRS=gobject refcount
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \
-I$(top_builddir)/glib \
$(gmodule_INCLUDES) \
$(GLIB_DEBUG_FLAGS)
AM_CFLAGS = -g

5
tests/gobject/Makefile.am
View File

@ -1,10 +1,7 @@
include $(top_srcdir)/Makefile.decl
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \
-I$(top_builddir)/glib \
$(gmodule_INCLUDES) \
$(GLIB_DEBUG_FLAGS)
libglib = $(top_builddir)/glib/libglib-2.0.la

5
tests/refcount/Makefile.am
View File

@ -1,10 +1,7 @@
include $(top_srcdir)/Makefile.decl
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/glib \
-I$(top_srcdir)/gmodule \
-I$(top_builddir)/glib \
$(gmodule_INCLUDES) \
$(GLIB_DEBUG_FLAGS)
libglib = $(top_builddir)/glib/libglib-2.0.la