[yelp] Convert src subdirectory to non-recursive make
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [yelp] Convert src subdirectory to non-recursive make
- Date: Mon, 26 Oct 2015 12:27:29 +0000 (UTC)
commit b023298cef82921f02f88b073fd2a72da37f2696
Author: David King <amigadave amigadave com>
Date: Tue Oct 20 11:59:54 2015 +0200
Convert src subdirectory to non-recursive make
Makefile.am | 41 ++++++++++++++++++++++++++++++++++++++---
configure.ac | 1 -
src/Makefile.am | 37 -------------------------------------
3 files changed, 38 insertions(+), 41 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0b6b126..2527977 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,46 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = libyelp libyelp/web-extension src po data docs
+SUBDIRS = libyelp libyelp/web-extension po data docs
+
+bin_PROGRAMS = yelp
+
+yelp_SOURCES = \
+ src/yelp-application.c \
+ src/yelp-window.c \
+ src/yelp.c
+
+yelp_headers = \
+ src/yelp-application.h \
+ src/yelp-window.h
+
+YELP_DEFINES = \
+ -DG_LOG_DOMAIN=\"Yelp\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DLOCALEDIR=\""$(localedir)"\"
+
+yelp_CFLAGS = \
+ $(YELP_CFLAGS) \
+ $(WARN_CFLAGS)
+
+yelp_CPPFLAGS = \
+ -I$(top_srcdir)/libyelp \
+ $(YELP_DEFINES)
+
+yelp_LDADD = \
+ $(top_builddir)/libyelp/libyelp.la \
+ $(top_builddir)/libyelp/libyelpcommon.la \
+ $(YELP_LIBS)
+
+yelp_LDFLAGS = $(WARN_LDFLAGS)
+
+install-exec-hook:
+ rm -f $(DESTDIR)$(bindir)/gnome-help && \
+ $(LN_S) yelp $(DESTDIR)$(bindir)/gnome-help
YELP_COMMON_CFLAGS = \
$(YELP_CFLAGS) \
$(WARN_CFLAGS) \
$(YELP_DEFINES) \
- -DDATADIR=\""$(datadir)"\" \
-I$(top_srcdir)/libyelp
YELP_COMMON_LDADD = \
$(YELP_LIBS) \
@@ -69,7 +103,8 @@ desktop_in_files=yelp.desktop.in.in
desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
dist_noinst_DATA = \
- $(desktop_in_files)
+ $(desktop_in_files) \
+ $(yelp_headers)
dist_noinst_SCRIPTS = \
autogen.sh
diff --git a/configure.ac b/configure.ac
index 5955377..01d88aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,7 +160,6 @@ docs/Makefile
docs/libyelp/Makefile
docs/libyelp/version.xml
libyelp/Makefile
-src/Makefile
data/Makefile
data/domains/Makefile
data/dtd/Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]