diff options
68 files changed, 140 insertions, 200 deletions
@@ -1,3 +1,75 @@ +14-05-29 Cyrille Bagard <nocbos@gmail.com> + + * plugins/androhelpers/Makefile.am: + * plugins/govm/Makefile.am: + * plugins/pychrysa/analysis/binaries/Makefile.am: + * plugins/pychrysa/analysis/blocks/Makefile.am: + * plugins/pychrysa/analysis/Makefile.am: + * plugins/pychrysa/arch/Makefile.am: + * plugins/pychrysa/debug/Makefile.am: + * plugins/pychrysa/format/dex/Makefile.am: + * plugins/pychrysa/format/elf/Makefile.am: + * plugins/pychrysa/format/Makefile.am: + * plugins/pychrysa/glibext/Makefile.am: + * plugins/pychrysa/gtkext/Makefile.am: + * plugins/pychrysa/gui/Makefile.am: + * plugins/pychrysa/gui/panels/Makefile.am: + * plugins/pychrysa/Makefile.am: + * plugins/stackvars/Makefile.am: + * src/analysis/binaries/Makefile.am: + * src/analysis/blocks/Makefile.am: + * src/analysis/decomp/Makefile.am: + * src/analysis/disass/Makefile.am: + * src/analysis/Makefile.am: + * src/analysis/types/Makefile.am: + * src/arch/arm/Makefile.am: + * src/arch/arm/v456/Makefile.am: + * src/arch/arm/v456/operands/Makefile.am: + * src/arch/dalvik/decomp/Makefile.am: + * src/arch/dalvik/Makefile.am: + * src/arch/dalvik/opcodes/Makefile.am: + * src/arch/dalvik/operands/Makefile.am: + * src/arch/dalvik/pseudo/Makefile.am: + * src/arch/jvm/Makefile.am: + * src/arch/Makefile.am: + * src/arch/mips/Makefile.am: + * src/arch/x86/Makefile.am: + * src/arch/x86/opcodes/Makefile.am: + * src/arch/x86/operands/Makefile.am: + * src/common/Makefile.am: + * src/debug/jdwp/Makefile.am: + * src/debug/jdwp/misc/Makefile.am: + * src/debug/jdwp/sets/Makefile.am: + * src/debug/Makefile.am: + * src/debug/remgdb/Makefile.am: + * src/decomp/expr/dalvik/Makefile.am: + * src/decomp/expr/Makefile.am: + * src/decomp/instr/Makefile.am: + * src/decomp/lang/Makefile.am: + * src/decomp/Makefile.am: + * src/dialogs/Makefile.am: + * src/format/dex/Makefile.am: + * src/format/dwarf/Makefile.am: + * src/format/elf/Makefile.am: + * src/format/java/Makefile.am: + * src/format/Makefile.am: + * src/format/mangling/Makefile.am: + * src/format/pe/Makefile.am: + * src/glibext/Makefile.am: + * src/gtkext/graph/Makefile.am: + * src/gtkext/graph/nodes/Makefile.am: + * src/gtkext/Makefile.am: + * src/gui/Makefile.am: + * src/gui/menus/Makefile.am: + * src/gui/panels/Makefile.am: + * src/gui/tb/Makefile.am: + * src/Makefile.am: + * src/panels/Makefile.am: + * src/plugins/Makefile.am: + * src/plugins/overjump/Makefile.am: + Remove the warnings from automake by replacing the deprecated 'INCLUDES' + by 'AM_CPPFLAGS'. + 14-04-28 Cyrille Bagard <nocbos@gmail.com> * i18n.h: diff --git a/plugins/androhelpers/Makefile.am b/plugins/androhelpers/Makefile.am index acf4a4e..a568c9d 100644 --- a/plugins/androhelpers/Makefile.am +++ b/plugins/androhelpers/Makefile.am @@ -12,9 +12,7 @@ libandrohelpers_la_LDFLAGS = -L../../src/.libs -L../../src/gui/.libs -lchrysagui -L../../src/plugins/.libs -lplugins -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/govm/Makefile.am b/plugins/govm/Makefile.am index 7d3e212..e84f908 100644 --- a/plugins/govm/Makefile.am +++ b/plugins/govm/Makefile.am @@ -27,8 +27,6 @@ goas_SOURCES = \ tok.l -INCLUDES = - AM_CPPFLAGS = AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/Makefile.am b/plugins/pychrysa/Makefile.am index 148104f..3032c0e 100644 --- a/plugins/pychrysa/Makefile.am +++ b/plugins/pychrysa/Makefile.am @@ -22,11 +22,9 @@ pychrysa_la_LDFLAGS = -module -avoid-version $(LIBGTK_LIBS) $(LIBXML_LIBS) $(LIB -L../../src/plugins/.libs -lplugins -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) SUBDIRS = analysis arch debug format glibext gtkext gui diff --git a/plugins/pychrysa/analysis/Makefile.am b/plugins/pychrysa/analysis/Makefile.am index 3480e96..f970d94 100644 --- a/plugins/pychrysa/analysis/Makefile.am +++ b/plugins/pychrysa/analysis/Makefile.am @@ -15,11 +15,9 @@ libpychrysaanalysis_la_LIBADD = \ libpychrysaanalysis_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) SUBDIRS = binaries blocks diff --git a/plugins/pychrysa/analysis/binaries/Makefile.am b/plugins/pychrysa/analysis/binaries/Makefile.am index 7643acf..03a7aeb 100644 --- a/plugins/pychrysa/analysis/binaries/Makefile.am +++ b/plugins/pychrysa/analysis/binaries/Makefile.am @@ -8,9 +8,7 @@ libpychrysaanalysisbinaries_la_SOURCES =\ libpychrysaanalysisbinaries_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/analysis/blocks/Makefile.am b/plugins/pychrysa/analysis/blocks/Makefile.am index 46e99ce..b18f78a 100644 --- a/plugins/pychrysa/analysis/blocks/Makefile.am +++ b/plugins/pychrysa/analysis/blocks/Makefile.am @@ -9,9 +9,7 @@ libpychrysaanalysisblocks_la_SOURCES = \ libpychrysaanalysisblocks_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/arch/Makefile.am b/plugins/pychrysa/arch/Makefile.am index fd7c862..a01d570 100644 --- a/plugins/pychrysa/arch/Makefile.am +++ b/plugins/pychrysa/arch/Makefile.am @@ -11,9 +11,7 @@ libpychrysaarch_la_SOURCES = \ libpychrysaarch_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/debug/Makefile.am b/plugins/pychrysa/debug/Makefile.am index 3ed4348..503d228 100644 --- a/plugins/pychrysa/debug/Makefile.am +++ b/plugins/pychrysa/debug/Makefile.am @@ -9,9 +9,7 @@ libpychrysadebug_la_SOURCES = \ libpychrysadebug_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/format/Makefile.am b/plugins/pychrysa/format/Makefile.am index 46d4d23..0adbe0f 100644 --- a/plugins/pychrysa/format/Makefile.am +++ b/plugins/pychrysa/format/Makefile.am @@ -14,11 +14,9 @@ libpychrysaformat_la_LIBADD = \ libpychrysaformat_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) SUBDIRS = dex elf diff --git a/plugins/pychrysa/format/dex/Makefile.am b/plugins/pychrysa/format/dex/Makefile.am index 79b5322..ebf8966 100644 --- a/plugins/pychrysa/format/dex/Makefile.am +++ b/plugins/pychrysa/format/dex/Makefile.am @@ -10,9 +10,7 @@ libpychrysaformatdex_la_SOURCES = \ libpychrysaformatdex_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/format/elf/Makefile.am b/plugins/pychrysa/format/elf/Makefile.am index e2731cb..b8f9074 100644 --- a/plugins/pychrysa/format/elf/Makefile.am +++ b/plugins/pychrysa/format/elf/Makefile.am @@ -9,9 +9,7 @@ libpychrysaformatelf_la_SOURCES = \ libpychrysaformatelf_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/glibext/Makefile.am b/plugins/pychrysa/glibext/Makefile.am index da33fb6..14ab026 100644 --- a/plugins/pychrysa/glibext/Makefile.am +++ b/plugins/pychrysa/glibext/Makefile.am @@ -10,9 +10,7 @@ libpychrysaglibext_la_SOURCES = \ libpychrysaglibext_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/gtkext/Makefile.am b/plugins/pychrysa/gtkext/Makefile.am index 967c2ed..4849c7b 100644 --- a/plugins/pychrysa/gtkext/Makefile.am +++ b/plugins/pychrysa/gtkext/Makefile.am @@ -10,9 +10,7 @@ libpychrysagtkext_la_SOURCES = \ libpychrysagtkext_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/gui/Makefile.am b/plugins/pychrysa/gui/Makefile.am index 97c2d46..d4a724d 100644 --- a/plugins/pychrysa/gui/Makefile.am +++ b/plugins/pychrysa/gui/Makefile.am @@ -11,11 +11,9 @@ libpychrysagui_la_LIBADD = \ libpychrysagui_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) SUBDIRS = panels diff --git a/plugins/pychrysa/gui/panels/Makefile.am b/plugins/pychrysa/gui/panels/Makefile.am index 20e7f66..12e79ab 100644 --- a/plugins/pychrysa/gui/panels/Makefile.am +++ b/plugins/pychrysa/gui/panels/Makefile.am @@ -10,9 +10,7 @@ libpychrysaguipanels_la_SOURCES = \ libpychrysaguipanels_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ -I../../../../src -AM_CPPFLAGS = - AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/stackvars/Makefile.am b/plugins/stackvars/Makefile.am index a29c58a..13e235e 100644 --- a/plugins/stackvars/Makefile.am +++ b/plugins/stackvars/Makefile.am @@ -8,8 +8,6 @@ libstackvars_la_SOURCES = \ libstackvars_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I../../src - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I../../src AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index e4a1e16..75d16d6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -83,9 +83,7 @@ chrysalide_SOURCES = \ project.h project.c -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/intl $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) `pkg-config --cflags gthread-2.0` $(LIBPYTHON_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/intl $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) `pkg-config --cflags gthread-2.0` $(LIBPYTHON_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/analysis/Makefile.am b/src/analysis/Makefile.am index 79aa9d1..4842ec4 100755 --- a/src/analysis/Makefile.am +++ b/src/analysis/Makefile.am @@ -22,9 +22,7 @@ libanalysis_la_LIBADD = \ libanalysis_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/analysis/binaries/Makefile.am b/src/analysis/binaries/Makefile.am index f065070..a30e748 100755 --- a/src/analysis/binaries/Makefile.am +++ b/src/analysis/binaries/Makefile.am @@ -9,9 +9,7 @@ libanalysisbinaries_la_LIBADD = libanalysisbinaries_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/analysis/blocks/Makefile.am b/src/analysis/blocks/Makefile.am index fe1452a..500f02e 100755 --- a/src/analysis/blocks/Makefile.am +++ b/src/analysis/blocks/Makefile.am @@ -11,9 +11,7 @@ libanalysisblocks_la_LIBADD = libanalysisblocks_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/analysis/decomp/Makefile.am b/src/analysis/decomp/Makefile.am index 0e3ffb4..1a708f7 100755 --- a/src/analysis/decomp/Makefile.am +++ b/src/analysis/decomp/Makefile.am @@ -10,8 +10,6 @@ libanalysisdecomp_la_SOURCES = \ libanalysisdecomp_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/analysis/disass/Makefile.am b/src/analysis/disass/Makefile.am index 0f58100..65ed9c9 100644 --- a/src/analysis/disass/Makefile.am +++ b/src/analysis/disass/Makefile.am @@ -14,8 +14,6 @@ libanalysisdisass_la_SOURCES = \ libanalysisdisass_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/analysis/types/Makefile.am b/src/analysis/types/Makefile.am index 25a8a38..abe3915 100755 --- a/src/analysis/types/Makefile.am +++ b/src/analysis/types/Makefile.am @@ -14,9 +14,7 @@ libanalysistypes_la_LIBADD = libanalysistypes_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am index 57a5b74..94c8305 100644 --- a/src/arch/Makefile.am +++ b/src/arch/Makefile.am @@ -27,9 +27,7 @@ libarch_la_LIBADD = \ libarch_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/arm/Makefile.am b/src/arch/arm/Makefile.am index 16860e3..c480a47 100644 --- a/src/arch/arm/Makefile.am +++ b/src/arch/arm/Makefile.am @@ -13,9 +13,7 @@ libarcharm_la_LIBADD = \ libarcharm_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/arm/v456/Makefile.am b/src/arch/arm/v456/Makefile.am index 744777e..122d9c9 100644 --- a/src/arch/arm/v456/Makefile.am +++ b/src/arch/arm/v456/Makefile.am @@ -14,9 +14,7 @@ libarcharmv456_la_LIBADD = \ libarcharmv456_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/arm/v456/operands/Makefile.am b/src/arch/arm/v456/operands/Makefile.am index 9a8973b..1179c99 100644 --- a/src/arch/arm/v456/operands/Makefile.am +++ b/src/arch/arm/v456/operands/Makefile.am @@ -8,9 +8,7 @@ libarcharmv456operands_la_SOURCES = \ libarcharmv456_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/dalvik/Makefile.am b/src/arch/dalvik/Makefile.am index 8e7ec24..508e26d 100644 --- a/src/arch/dalvik/Makefile.am +++ b/src/arch/dalvik/Makefile.am @@ -20,9 +20,7 @@ libarchdalvik_la_LIBADD = \ libarchdalvik_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/dalvik/decomp/Makefile.am b/src/arch/dalvik/decomp/Makefile.am index 3a0a197..075c47d 100644 --- a/src/arch/dalvik/decomp/Makefile.am +++ b/src/arch/dalvik/decomp/Makefile.am @@ -22,8 +22,6 @@ libarchdalvikdecomp_la_LIBADD = libarchdalvikdecomp_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/dalvik/opcodes/Makefile.am b/src/arch/dalvik/opcodes/Makefile.am index 08de704..8632c0e 100644 --- a/src/arch/dalvik/opcodes/Makefile.am +++ b/src/arch/dalvik/opcodes/Makefile.am @@ -45,8 +45,6 @@ libarchdalvikopcodes_la_LIBADD = libarchdalvikopcodes_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/dalvik/operands/Makefile.am b/src/arch/dalvik/operands/Makefile.am index b6cba3c..8c88277 100644 --- a/src/arch/dalvik/operands/Makefile.am +++ b/src/arch/dalvik/operands/Makefile.am @@ -10,9 +10,7 @@ libarchdalvikoperands_la_SOURCES = \ libarchdalvik_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/dalvik/pseudo/Makefile.am b/src/arch/dalvik/pseudo/Makefile.am index 05e361f..9743220 100644 --- a/src/arch/dalvik/pseudo/Makefile.am +++ b/src/arch/dalvik/pseudo/Makefile.am @@ -10,8 +10,6 @@ libarchdalvikpseudo_la_LIBADD = libarchdalvikpseudo_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/jvm/Makefile.am b/src/arch/jvm/Makefile.am index 32c749c..99e4ac0 100644 --- a/src/arch/jvm/Makefile.am +++ b/src/arch/jvm/Makefile.am @@ -22,9 +22,7 @@ libarchjvm_la_SOURCES = \ libarchjvm_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/mips/Makefile.am b/src/arch/mips/Makefile.am index 95af97f..f208ef6 100644 --- a/src/arch/mips/Makefile.am +++ b/src/arch/mips/Makefile.am @@ -20,9 +20,7 @@ libarchmips_la_SOURCES = \ libarchmips_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/x86/Makefile.am b/src/arch/x86/Makefile.am index e657699..1a41e72 100644 --- a/src/arch/x86/Makefile.am +++ b/src/arch/x86/Makefile.am @@ -14,9 +14,7 @@ libarchx86_la_LIBADD = \ libarchx86_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/x86/opcodes/Makefile.am b/src/arch/x86/opcodes/Makefile.am index 6f7f71e..72eed13 100644 --- a/src/arch/x86/opcodes/Makefile.am +++ b/src/arch/x86/opcodes/Makefile.am @@ -50,8 +50,6 @@ libarchx86opcodes_la_LIBADD = libarchx86opcodes_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/x86/operands/Makefile.am b/src/arch/x86/operands/Makefile.am index ac48667..e04270a 100644 --- a/src/arch/x86/operands/Makefile.am +++ b/src/arch/x86/operands/Makefile.am @@ -11,9 +11,7 @@ libarchx86operands_la_SOURCES = \ libarchx86_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index b5df3a4..da4f98e 100755 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -18,9 +18,7 @@ libcommon_la_SOURCES = \ libcommon_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/debug/Makefile.am b/src/debug/Makefile.am index e2e87b8..e9dd1fd 100755 --- a/src/debug/Makefile.am +++ b/src/debug/Makefile.am @@ -15,9 +15,7 @@ libdebug_la_LIBADD = \ libdebug_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/debug/jdwp/Makefile.am b/src/debug/jdwp/Makefile.am index a9b9c81..891837d 100644 --- a/src/debug/jdwp/Makefile.am +++ b/src/debug/jdwp/Makefile.am @@ -14,9 +14,7 @@ libdebugjdwp_la_LIBADD = \ libdebugjdwp_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/debug/jdwp/misc/Makefile.am b/src/debug/jdwp/misc/Makefile.am index f955501..e25997c 100644 --- a/src/debug/jdwp/misc/Makefile.am +++ b/src/debug/jdwp/misc/Makefile.am @@ -10,8 +10,6 @@ libdebugjdwpmisc_la_SOURCES = \ libdebugjdwpmisc_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/debug/jdwp/sets/Makefile.am b/src/debug/jdwp/sets/Makefile.am index 55277bf..a91f5f6 100644 --- a/src/debug/jdwp/sets/Makefile.am +++ b/src/debug/jdwp/sets/Makefile.am @@ -9,8 +9,6 @@ libdebugjdwpsets_la_SOURCES = \ libdebugjdwpsets_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/debug/remgdb/Makefile.am b/src/debug/remgdb/Makefile.am index 7ed26b0..47e5fdc 100644 --- a/src/debug/remgdb/Makefile.am +++ b/src/debug/remgdb/Makefile.am @@ -12,8 +12,6 @@ libdebugremgdb_la_SOURCES = \ libdebugremgdb_la_CFLAGS = $(AM_CFLAGS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/decomp/Makefile.am b/src/decomp/Makefile.am index ab12e01..8e9dce2 100755 --- a/src/decomp/Makefile.am +++ b/src/decomp/Makefile.am @@ -19,9 +19,7 @@ libdecomp_la_LIBADD = \ libdecomp_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/decomp/expr/Makefile.am b/src/decomp/expr/Makefile.am index 3ff6cb5..665c3f7 100644 --- a/src/decomp/expr/Makefile.am +++ b/src/decomp/expr/Makefile.am @@ -20,9 +20,8 @@ libdecompexpr_la_LDFLAGS = libdecompexpr_la_LIBADD = \ dalvik/libdecompexprdalvik.la -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/decomp/expr/dalvik/Makefile.am b/src/decomp/expr/dalvik/Makefile.am index a14b9dd..1fe430e 100644 --- a/src/decomp/expr/dalvik/Makefile.am +++ b/src/decomp/expr/dalvik/Makefile.am @@ -7,8 +7,6 @@ libdecompexprdalvik_la_SOURCES = \ libdecompexprdalvik_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/decomp/instr/Makefile.am b/src/decomp/instr/Makefile.am index d299cd2..28f6e3f 100644 --- a/src/decomp/instr/Makefile.am +++ b/src/decomp/instr/Makefile.am @@ -10,9 +10,8 @@ libdecompinstr_la_LDFLAGS = libdecompinstr_la_LIBADD = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/decomp/lang/Makefile.am b/src/decomp/lang/Makefile.am index 6f5fd59..7dc4e21 100755 --- a/src/decomp/lang/Makefile.am +++ b/src/decomp/lang/Makefile.am @@ -8,8 +8,6 @@ libdecomplang_la_SOURCES = \ libdecomplang_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/dialogs/Makefile.am b/src/dialogs/Makefile.am index 20812fc..7be1fd6 100644 --- a/src/dialogs/Makefile.am +++ b/src/dialogs/Makefile.am @@ -13,9 +13,7 @@ libdialogs_la_SOURCES = \ libdialogs_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/format/Makefile.am b/src/format/Makefile.am index c6be803..1c06de9 100644 --- a/src/format/Makefile.am +++ b/src/format/Makefile.am @@ -21,9 +21,9 @@ libformat_la_SOURCES = \ # part.h part.c libformat_la_LIBADD = \ - dex/libformatdex.la \ + dex/libformatdex.la \ elf/libformatelf.la \ - java/libformatjava.la \ + java/libformatjava.la \ mangling/libformatmangling.la \ pe/libformatpe.la @@ -38,9 +38,7 @@ libformat_la_LIBADD = \ libformat_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/format/dex/Makefile.am b/src/format/dex/Makefile.am index 76cd63e..7a2416f 100755 --- a/src/format/dex/Makefile.am +++ b/src/format/dex/Makefile.am @@ -12,8 +12,6 @@ libformatdex_la_SOURCES = \ libformatdex_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/format/dwarf/Makefile.am b/src/format/dwarf/Makefile.am index f166b5e..5c92107 100644 --- a/src/format/dwarf/Makefile.am +++ b/src/format/dwarf/Makefile.am @@ -15,8 +15,6 @@ libformatdwarf_la_SOURCES = \ libformatdwarf_la_LDFLAGS = $(LIBGTK_LIBS) -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/format/elf/Makefile.am b/src/format/elf/Makefile.am index d91e2b0..fb76a9d 100644 --- a/src/format/elf/Makefile.am +++ b/src/format/elf/Makefile.am @@ -16,8 +16,6 @@ libformatelf_la_SOURCES = \ libformatelf_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/format/java/Makefile.am b/src/format/java/Makefile.am index 7a5fd9c..37f48ee 100755 --- a/src/format/java/Makefile.am +++ b/src/format/java/Makefile.am @@ -19,8 +19,6 @@ libformatjava_la_SOURCES = \ libformatjava_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/format/mangling/Makefile.am b/src/format/mangling/Makefile.am index b33c365..0bb9444 100644 --- a/src/format/mangling/Makefile.am +++ b/src/format/mangling/Makefile.am @@ -31,9 +31,7 @@ libjavamangling_la_LFLAGS = -P java_ -o lex.yy.c -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/format/pe/Makefile.am b/src/format/pe/Makefile.am index c977653..23976f8 100755 --- a/src/format/pe/Makefile.am +++ b/src/format/pe/Makefile.am @@ -11,8 +11,6 @@ libformatpe_la_SOURCES = \ libformatpe_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/glibext/Makefile.am b/src/glibext/Makefile.am index f7f3da3..19ff59a 100644 --- a/src/glibext/Makefile.am +++ b/src/glibext/Makefile.am @@ -17,9 +17,7 @@ libglibext_la_SOURCES = \ libglibext_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/gtkext/Makefile.am b/src/gtkext/Makefile.am index 18678b8..5c1dec4 100644 --- a/src/gtkext/Makefile.am +++ b/src/gtkext/Makefile.am @@ -22,9 +22,7 @@ libgtkext_la_LIBADD = \ libgtkext_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/gtkext/graph/Makefile.am b/src/gtkext/graph/Makefile.am index ead315a..50ec8d0 100755 --- a/src/gtkext/graph/Makefile.am +++ b/src/gtkext/graph/Makefile.am @@ -15,9 +15,7 @@ libgtkextgraph_la_LIBADD = \ libgtkextgraph_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBGRAPH_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBGRAPH_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/gtkext/graph/nodes/Makefile.am b/src/gtkext/graph/nodes/Makefile.am index 7bbe99a..50f26f1 100755 --- a/src/gtkext/graph/nodes/Makefile.am +++ b/src/gtkext/graph/nodes/Makefile.am @@ -8,9 +8,7 @@ libgtkextgraphnodes_la_SOURCES = \ libgtkextgraphnodes_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 2e2bc1c..196bb87 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -14,9 +14,7 @@ libgui_la_LIBADD = \ libgui_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/gui/menus/Makefile.am b/src/gui/menus/Makefile.am index ba38f0f..fcebcf2 100644 --- a/src/gui/menus/Makefile.am +++ b/src/gui/menus/Makefile.am @@ -17,9 +17,7 @@ libguimenus_la_LIBADD = $(LIBINTL) \ ../../dialogs/libdialogs.la -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/gui/panels/Makefile.am b/src/gui/panels/Makefile.am index ac90bf1..12b51cb 100644 --- a/src/gui/panels/Makefile.am +++ b/src/gui/panels/Makefile.am @@ -12,9 +12,7 @@ libguipanels_la_SOURCES = \ libguipanels_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/gui/tb/Makefile.am b/src/gui/tb/Makefile.am index 5cd46a8..52033c3 100644 --- a/src/gui/tb/Makefile.am +++ b/src/gui/tb/Makefile.am @@ -9,9 +9,7 @@ libguitb_la_SOURCES = \ libguitb_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/panels/Makefile.am b/src/panels/Makefile.am index 4d24b93..47665b6 100755 --- a/src/panels/Makefile.am +++ b/src/panels/Makefile.am @@ -12,9 +12,7 @@ libpanels_la_SOURCES = \ libpanels_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index f1db58f..96558be 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -14,9 +14,7 @@ libplugins_la_CFLAGS = $(AM_CFLAGS) libplugins_la_LDFLAGS = -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/plugins/overjump/Makefile.am b/src/plugins/overjump/Makefile.am index 1101c34..76ba978 100644 --- a/src/plugins/overjump/Makefile.am +++ b/src/plugins/overjump/Makefile.am @@ -8,9 +8,7 @@ libpluginoverjump_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS) $(LIBPYTHON_LIBS) \ -L../../panel/.libs -lpanel -INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) - -AM_CPPFLAGS = +AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) |