autoconfiscate the building of the shar

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@116 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/Makefile.am b/Makefile.am
index 4183188..5df3bb9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,4 +2,4 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = schemas shib eduPerson shib-target test
+SUBDIRS = schemas shib eduPerson shib-target shar test

diff --git a/configure.ac b/configure.ac
index 375009d..c7e0aac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -115,5 +115,5 @@ AC_TRY_LINK(
 
 # output makefiles
 AC_OUTPUT(Makefile shib/Makefile schemas/Makefile eduPerson/Makefile \
-                  shib-target/Makefile test/Makefile)
+                  shib-target/Makefile test/Makefile shar/Makefile )
 

diff --git a/shar/.cvsignore b/shar/.cvsignore
new file mode 100644 (file)
index 0000000..450fb33
--- /dev/null
+++ b/shar/.cvsignore
@@ -0,0 +1,5 @@
+.libs
+.deps
+Makefile
+Makefile.in
+shar

diff --git a/shar/Makefile.am b/shar/Makefile.am
new file mode 100644 (file)
index 0000000..64007c1
--- /dev/null
+++ b/shar/Makefile.am
@@ -0,0 +1,10 @@
+## $Id$
+
+AUTOMAKE_OPTIONS = foreign
+
+bin_PROGRAMS = shar
+
+shar_SOURCES = shar.c
+
+shar_LDADD = $(top_builddir)/shib-target/libshib-target.la \
+       $(top_builddir)/shib/libshib.la

diff --git a/shar/shar.c b/shar/shar.c
index ede61f8..15fa657 100644 (file)
--- a/shar/shar.c
+++ b/shar/shar.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include "shib-target.h"
+#include <shib-target/shib-target.h>
 
 extern void shibrpc_prog_1(struct svc_req *, SVCXPRT *);
 

diff --git a/shib-target/Makefile.am b/shib-target/Makefile.am
index 73c974d..af219e3 100644 (file)
--- a/shib-target/Makefile.am
+++ b/shib-target/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign
 
 lib_LTLIBRARIES = libshib-target.la
 
-libshib_targetdir = $(includedir)/shib
+libshib_targetdir = $(includedir)/shib-target
 libshib_target_HEADERS = shib-target.h shibrpc.h
 
 libshib_target_la_SOURCES = \

diff --git a/shib-target/shib-target.h b/shib-target/shib-target.h
index aaf1377..366ddfd 100644 (file)
--- a/shib-target/shib-target.h
+++ b/shib-target/shib-target.h
@@ -9,7 +9,7 @@
 #ifndef SHIB_COMMON_H
 #define SHIB_COMMON_H
 
-#include "shibrpc.h"
+#include <shib-target/shibrpc.h>
 
 #ifdef __cplusplus
 extern "C" {