diff options
author | Jonathan McCrohan <jmccrohan@gmail.com> | 2011-12-01 23:47:41 +0000 |
---|---|---|
committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2011-12-01 23:47:41 +0000 |
commit | 1eaceca55c7e62892fd28bfbb5fc03240a48cee3 (patch) | |
tree | 7243fcd09c57e06e72b15f0044fd2c77babd7843 /samples/c++/Makefile.am | |
parent | d4b5ddf4bcacd692011f5a597025c38a1262d6ca (diff) | |
parent | 429e46051dba814e7d6c74368eb1bba550222cbe (diff) | |
download | libconfig-1eaceca55c7e62892fd28bfbb5fc03240a48cee3.tar.gz |
Merge commit 'upstream/1.4.8'
Conflicts:
debian/changelog
debian/control
debian/libconfig++9-dev.install
debian/libconfig8.install
debian/libconfig9-dev.install
debian/rules
Diffstat (limited to '')
-rw-r--r-- | samples/c++/Makefile.am | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/samples/c++/Makefile.am b/samples/c++/Makefile.am deleted file mode 100644 index b1cdb9b..0000000 --- a/samples/c++/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ - -noinst_PROGRAMS = stubcpp sample1 sample2 sample3 - -stubcpp_SOURCES = stubcpp.cpp - -sample1_SOURCES = sample1.cpp - -sample2_SOURCES = sample2.cpp - -sample3_SOURCES = sample3.cpp - -AM_CPPFLAGS = -I $(top_srcdir) - -LDADD = -L../../.libs -lconfig++ |