diff options
| author | David King <amigadave@amigadave.com> | 2015-10-20 11:59:54 +0200 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2015-10-20 12:11:40 +0200 |
| commit | b023298cef82921f02f88b073fd2a72da37f2696 (patch) | |
| tree | e2ca1ec9cf6811e69bd4e5269070058516977c1c | |
| parent | 437956c3d8e67db93d300111ec41bd121dccda24 (diff) | |
| download | yelp-b023298cef82921f02f88b073fd2a72da37f2696.tar.gz | |
Convert src subdirectory to non-recursive make
| -rw-r--r-- | Makefile.am | 41 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 37 |
3 files changed, 38 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am index 0b6b1265..25279771 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 5955377a..01d88aaa 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 diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 288a0ac6..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -bin_PROGRAMS = yelp - -yelp_SOURCES = \ - yelp-application.c yelp-application.h \ - yelp-window.c yelp-window.h \ - yelp.c - -YELP_DEFINES = \ - -DG_LOG_DOMAIN=\"Yelp\" \ - -DPREFIX=\""$(prefix)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DLOCALEDIR=\""$(localedir)"\" \ - -DLIBDIR=\""$(libdir)"\" \ - -DIMAGEDIR=\""$(datadir)/images/yelp"\" \ - -DSERVERDIR=\"$(libexecdir)\" \ - -DBINDIR=\""$(bindir)"\" \ - -DSHAREDIR=\""$(pkgdatadir)"\" \ - -DGDU_ICON_PATH=\"$(GDU_ICON_PATH)\" - -yelp_CFLAGS = \ - -I$(top_srcdir)/libyelp \ - $(YELP_CFLAGS) \ - $(WARN_CFLAGS) \ - $(YELP_DEFINES) - -yelp_LDADD = \ - $(top_builddir)/libyelp/libyelp.la \ - $(top_builddir)/libyelp/libyelpcommon.la \ - $(YELP_LIBS) \ - $(POPT_LIBS) - -yelp_LDFLAGS = $(WARN_LDFLAGS) - -install-exec-hook: - rm -f $(DESTDIR)$(bindir)/gnome-help && \ - $(LN_S) yelp $(DESTDIR)$(bindir)/gnome-help |