diff options
| -rw-r--r-- | mixgtk/Makefile.am | 14 | ||||
| -rw-r--r-- | mixguile/Makefile.am | 6 | ||||
| -rw-r--r-- | mixlib/Makefile.am | 2 | ||||
| -rw-r--r-- | mixlib/testsuite/Makefile.am | 9 | ||||
| -rw-r--r-- | mixutils/Makefile.am | 6 |
5 files changed, 16 insertions, 21 deletions
diff --git a/mixgtk/Makefile.am b/mixgtk/Makefile.am index 37e16ad..4cb6620 100644 --- a/mixgtk/Makefile.am +++ b/mixgtk/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -# Copyright (C) 2001, 2004, 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2004, 2006, 2008, 2014 Free Software Foundation, Inc. # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -30,12 +30,12 @@ if MAKE_GUI pkgdata_DATA = mixgtk.glade -INCLUDES = -I$(includedir) -I$(top_srcdir) \ - -DGLADE_FILE=\""$(pkgdatadir)/mixgtk.glade"\"\ - -DLOCAL_GLADE_FILE=\""$(srcdir)/mixgtk.glade"\"\ - -DDEFAULT_EDITOR_CMD=\"$(EDITOR_CMD)\"\ - -DDEFAULT_ASM_CMD="\"$(bindir)/mixasm %s"\"\ - $(GUILED) $(EXTRA_EXECD) +AM_CFLAGS += -I$(includedir) -I$(top_srcdir) \ + -DGLADE_FILE=\""$(pkgdatadir)/mixgtk.glade"\"\ + -DLOCAL_GLADE_FILE=\""$(srcdir)/mixgtk.glade"\"\ + -DDEFAULT_EDITOR_CMD=\"$(EDITOR_CMD)\"\ + -DDEFAULT_ASM_CMD="\"$(bindir)/mixasm %s"\"\ + $(GUILED) $(EXTRA_EXECD) LDADD = $(top_builddir)/mixlib/libmix.a $(top_builddir)/lib/libreplace.a\ $(top_builddir)/mixguile/libmixguile.a $(INTLLIBS) diff --git a/mixguile/Makefile.am b/mixguile/Makefile.am index a55c05e..1005360 100644 --- a/mixguile/Makefile.am +++ b/mixguile/Makefile.am @@ -21,9 +21,9 @@ SCM_PATHS = -DSCM_FILE=\""$(pkgdatadir)/mixguile.scm"\"\ -DLOCAL_SCM_FILE=\"mixguile.scm\" pkgdata_DATA = $(SCM_FILES) -INCLUDES = -I$(includedir) -I$(top_srcdir) $(SCM_PATHS) -libmixguile_a_INCLUDES = -I$(includedir) -I$(top_srcdir) \ - -DG_LOG_DOMAIN=\"libmixguile\" +AM_CFLAGS += -I$(includedir) -I$(top_srcdir) $(SCM_PATHS) +libmixguile_a_AM_CFLAGS = -I$(includedir) -I$(top_srcdir) \ + -DG_LOG_DOMAIN=\"libmixguile\" libmixguile_a_SOURCES = mixguile.h mixguile.c \ mixguile_cmd_dispatcher.h mixguile_cmd_dispatcher.c \ xmixguile_cmd_dispatcher.h xmixguile_cmd_dispatcher.c diff --git a/mixlib/Makefile.am b/mixlib/Makefile.am index b38af6d..7a9d1fd 100644 --- a/mixlib/Makefile.am +++ b/mixlib/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS = testsuite -INCLUDES = -I$(includedir) -I$(top_srcdir) -DG_LOG_DOMAIN=\"libmix\" +AM_CFLAGS += -I$(includedir) -I$(top_srcdir) -DG_LOG_DOMAIN=\"libmix\" noinst_LIBRARIES = libmix.a libmix_a_SOURCES = gettext.h \ diff --git a/mixlib/testsuite/Makefile.am b/mixlib/testsuite/Makefile.am index 3878cff..329ab2b 100644 --- a/mixlib/testsuite/Makefile.am +++ b/mixlib/testsuite/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -# Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2006, 2014 Free Software Foundation, Inc. # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -11,7 +11,7 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -INCLUDES = -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/mixlib +AM_CFLAGS += -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/mixlib LDADD = $(top_builddir)/mixlib/libmix.a check_PROGRAMS = mixtypest mixinstest mixvminstest mixparsertest mixdevtest mixevaltest @@ -30,8 +30,3 @@ mixparsertest_SOURCES = test.h mix_parser_t.c distclean-local: rm -f *.mix - - - - - diff --git a/mixutils/Makefile.am b/mixutils/Makefile.am index 9faaa8e..384d89d 100644 --- a/mixutils/Makefile.am +++ b/mixutils/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -# Copyright (C) 2000, 2001, 2002, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2006, 2014 Free Software Foundation, Inc. # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -12,9 +12,9 @@ if MAKE_GUILE -INCLUDES = -I$(includedir) -I$(top_srcdir) -DMAKE_GUILE +AM_CFLAGS += -I$(includedir) -I$(top_srcdir) -DMAKE_GUILE else -INCLUDES = -I$(includedir) -I$(top_srcdir) +AM_CFLAGS += -I$(includedir) -I$(top_srcdir) endif LDADD = $(top_builddir)/mixlib/libmix.a $(top_builddir)/lib/libreplace.a \ |