diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-08-09 14:38:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 14:38:07 -0400 |
| commit | fc73dd4bdf96cbab00e7d5de67ec56503c6d9783 (patch) | |
| tree | 573180d0bff416bd056836667b6f09ded881890f /ospfclient | |
| parent | f790234f2ff2e1d6c7a230e5c1d9dac280a12d44 (diff) | |
| parent | b6f5781c33d29092a3c3dc40778a6e926a65f65a (diff) | |
Merge pull request #911 from opensourcerouting/non-recursive-2
more non-recursive build, fix cross-compile, & doc build mangling
Diffstat (limited to 'ospfclient')
| -rw-r--r-- | ospfclient/.gitignore | 2 | ||||
| -rw-r--r-- | ospfclient/Makefile | 10 | ||||
| -rw-r--r-- | ospfclient/Makefile.am | 28 | ||||
| -rw-r--r-- | ospfclient/subdir.am | 30 |
4 files changed, 41 insertions, 29 deletions
diff --git a/ospfclient/.gitignore b/ospfclient/.gitignore index a6000f8021..1740b04fbc 100644 --- a/ospfclient/.gitignore +++ b/ospfclient/.gitignore @@ -1,4 +1,4 @@ -Makefile +!Makefile Makefile.in *.o ospfclient diff --git a/ospfclient/Makefile b/ospfclient/Makefile new file mode 100644 index 0000000000..3da2a5b897 --- /dev/null +++ b/ospfclient/Makefile @@ -0,0 +1,10 @@ +all: ALWAYS + @$(MAKE) -s -C .. ospfclient/ospfclient +%: ALWAYS + @$(MAKE) -s -C .. ospfclient/$@ + +Makefile: + #nothing +ALWAYS: +.PHONY: ALWAYS makefiles +.SUFFIXES: diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am deleted file mode 100644 index b4e362bbb3..0000000000 --- a/ospfclient/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## Automake.am for OSPF API client -AUTOMAKE_OPTIONS = subdir-objects - -AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib -AM_CFLAGS = $(WERROR) - -lib_LTLIBRARIES = libfrrospfapiclient.la -libfrrospfapiclient_la_LDFLAGS = -version-info 0:0:0 -libfrrospfapiclient_la_LIBADD = ../lib/libfrr.la - -sbin_PROGRAMS = ospfclient - -libfrrospfapiclient_la_SOURCES = \ - ospf_apiclient.c - -ospfapiheaderdir = $(pkgincludedir)/ospfapi - -ospfapiheader_HEADERS = \ - ospf_apiclient.h - -ospfclient_SOURCES = \ - ospfclient.c - -ospfclient_LDADD = libfrrospfapiclient.la \ - ../lib/libfrr.la @LIBCAP@ - -ospfclient_CFLAGS = $(AM_CFLAGS) -ospfclient_LDFLAGS = $(AM_LDFLAGS) diff --git a/ospfclient/subdir.am b/ospfclient/subdir.am new file mode 100644 index 0000000000..834d4aaba7 --- /dev/null +++ b/ospfclient/subdir.am @@ -0,0 +1,30 @@ +# +# ospfclient +# + +if OSPFCLIENT +lib_LTLIBRARIES += ospfclient/libfrrospfapiclient.la +sbin_PROGRAMS += ospfclient/ospfclient +endif + +ospfclient_libfrrospfapiclient_la_LDFLAGS = -version-info 0:0:0 +ospfclient_libfrrospfapiclient_la_LIBADD = lib/libfrr.la +ospfclient_libfrrospfapiclient_la_SOURCES = \ + ospfclient/ospf_apiclient.c \ + # end + +if OSPFCLIENT +ospfapiheaderdir = $(pkgincludedir)/ospfapi +ospfapiheader_HEADERS = \ + ospfclient/ospf_apiclient.h \ + # end +endif + +ospfclient_ospfclient_LDADD = \ + ospfclient/libfrrospfapiclient.la \ + lib/libfrr.la \ + @LIBCAP@ \ + # end +ospfclient_ospfclient_SOURCES = \ + ospfclient/ospfclient.c \ + # end |