From 560f516d1feb3c52cd45371cab0f5e0d47fd6f38 Mon Sep 17 00:00:00 2001 From: "hyunghwan.chung" Date: Sun, 15 Nov 2020 09:40:48 +0000 Subject: [PATCH] fixed dependency in bin/Makefile.am --- moo/bin/Makefile.am | 9 ++++----- moo/bin/Makefile.in | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/moo/bin/Makefile.am b/moo/bin/Makefile.am index af81bcf..7118729 100644 --- a/moo/bin/Makefile.am +++ b/moo/bin/Makefile.am @@ -5,13 +5,12 @@ CPPFLAGS_COMMON = \ -I$(abs_builddir)/../lib \ -I$(abs_srcdir) \ -I$(abs_srcdir)/../lib \ - -I$(includedir) \ - $(PTHREAD_CFLAGS) + -I$(includedir) CFLAGS_COMMON = LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) LIBADD_COMMON = -lmoo -DEPENDENCIES_COMMON = +DEPENDENCIES_COMMON = ../lib/libmoo.la bin_PROGRAMS = moo @@ -23,7 +22,7 @@ moo_CPPFLAGS = $(CPPFLAGS_COMMON) moo_CFLAGS = $(CFLAGS_COMMON) moo_LDFLAGS = $(LDFLAGS_COMMON) moo_LDADD = $(LIBADD_COMMON) -moo_DEPENDENCIES = ../lib/libmoo.la +moo_DEPENDENCIES = $(DEPENDENCIES_COMMON) if ENABLE_EXPERIMENTAL @@ -37,6 +36,6 @@ moo_gtk_CPPFLAGS = $(CPPFLAGS_COMMON) -I/usr/include/gtk-3.0 -I/usr/include/at-s moo_gtk_CFLAGS = $(CFLAGS_COMMON) moo_gtk_LDFLAGS = $(LDFLAGS_COMMON) moo_gtk_LDADD = $(LIBADD_COMMON) -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -moo_gtk_DEPENDENCIES = ../lib/libmoo.la +moo_gtk_DEPENDENCIES = $(DEPENDENCIES_COMMON) endif diff --git a/moo/bin/Makefile.in b/moo/bin/Makefile.in index d0c50b3..8cabba3 100644 --- a/moo/bin/Makefile.in +++ b/moo/bin/Makefile.in @@ -335,13 +335,12 @@ CPPFLAGS_COMMON = \ -I$(abs_builddir)/../lib \ -I$(abs_srcdir) \ -I$(abs_srcdir)/../lib \ - -I$(includedir) \ - $(PTHREAD_CFLAGS) + -I$(includedir) CFLAGS_COMMON = LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) LIBADD_COMMON = -lmoo -DEPENDENCIES_COMMON = +DEPENDENCIES_COMMON = ../lib/libmoo.la ################################################## # moo @@ -351,13 +350,13 @@ moo_CPPFLAGS = $(CPPFLAGS_COMMON) moo_CFLAGS = $(CFLAGS_COMMON) moo_LDFLAGS = $(LDFLAGS_COMMON) moo_LDADD = $(LIBADD_COMMON) -moo_DEPENDENCIES = ../lib/libmoo.la +moo_DEPENDENCIES = $(DEPENDENCIES_COMMON) @ENABLE_EXPERIMENTAL_TRUE@moo_gtk_SOURCES = gtk-main.c @ENABLE_EXPERIMENTAL_TRUE@moo_gtk_CPPFLAGS = $(CPPFLAGS_COMMON) -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include @ENABLE_EXPERIMENTAL_TRUE@moo_gtk_CFLAGS = $(CFLAGS_COMMON) @ENABLE_EXPERIMENTAL_TRUE@moo_gtk_LDFLAGS = $(LDFLAGS_COMMON) @ENABLE_EXPERIMENTAL_TRUE@moo_gtk_LDADD = $(LIBADD_COMMON) -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -@ENABLE_EXPERIMENTAL_TRUE@moo_gtk_DEPENDENCIES = ../lib/libmoo.la +@ENABLE_EXPERIMENTAL_TRUE@moo_gtk_DEPENDENCIES = $(DEPENDENCIES_COMMON) all: all-am .SUFFIXES: