Skip to content

Commit

Permalink
Embed a copy of yasl instead of using a submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
flowerysong committed Aug 11, 2015
1 parent e6c2502 commit eaf3762
Show file tree
Hide file tree
Showing 8 changed files with 921 additions and 10 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

25 changes: 25 additions & 0 deletions COPYING.yasl
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Copyright (c) 2006-2014, Salvatore Sanfilippo <antirez at gmail dot com>
Copyright (c) 2014-2015, The yasl developers

All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8 changes: 4 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ACLOCAL_AMFLAGS = -I m4
AM_LDFLAGS = @LDFLAGS@ @LDAP_LDFLAGS@ @BDB_LDFLAGS@
AM_LDFLAGS = @LDFLAGS@ @LDAP_LDFLAGS@ @BDB_LDFLAGS@
AM_CPPFLAGS = @CPPFLAGS@ @LDAP_CPPFLAGS@ @BDB_CPPFLAGS@

bin_PROGRAMS = simvacation simunvacation

simvacation_SOURCES = yasl/src/yasl.c yasl/src/yasl.h argcargv.c argcargv.h simvacation.h simvacation.c
simvacation_SOURCES = yasl.c yasl.h argcargv.c argcargv.h simvacation.h simvacation.c
simvacation_LDADD =

simunvacation_SOURCES = yasl/src/yasl.c yasl/src/yasl.h argcargv.c argcargv.h simvacation.h simunvacation.c
simunvacation_SOURCES = yasl.c yasl.h argcargv.c argcargv.h simvacation.h simunvacation.c
simunvacation_LDADD =

if BACKEND_NULL
Expand Down Expand Up @@ -41,4 +41,4 @@ endif

dist_man_MANS = simvacation.8 simunvacation.8 simvacreport.8

EXTRA_DIST = yasl/LICENSE yasl/README.rst
EXTRA_DIST = COPYING.yasl
2 changes: 1 addition & 1 deletion simvacation.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define SIMVACATION_H

#include <config.h>
#include "yasl/src/yasl.h"
#include "yasl.h"

#define HEADER_UNKNOWN 0
#define HEADER_RECIPIENT 1
Expand Down
2 changes: 1 addition & 1 deletion vlu_ldap.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <lber.h>
#include <ldap.h>

#include "yasl/src/yasl.h"
#include "yasl.h"

#define LDAP_HOST "ldap.itd.umich.edu"
#define BIND_DN NULL
Expand Down
1 change: 0 additions & 1 deletion yasl
Submodule yasl deleted from e2f67d
Loading

0 comments on commit eaf3762

Please sign in to comment.