diff options
| author | Tavian Barnes <tavianator@gmail.com> | 2009-04-10 15:59:19 +0000 |
|---|---|---|
| committer | Tavian Barnes <tavianator@gmail.com> | 2009-04-10 15:59:19 +0000 |
| commit | 842f519e3164081c00601c0e3631e7cbb6d039a2 (patch) | |
| tree | 6cb3a57c10556d7680fa50e21d807826e1fe47c9 | |
| parent | c1212cee3b7955304435c9659b9572109407ce36 (diff) | |
| download | dimension-842f519e3164081c00601c0e3631e7cbb6d039a2.tar.xz | |
Clarify licenses; add libdimensionxx library.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libdimension-png/Makefile.am | 2 | ||||
| -rw-r--r-- | libdimension-png/dimension-png.h | 16 | ||||
| -rw-r--r-- | libdimension-png/png.c | 16 | ||||
| -rw-r--r-- | libdimension/Makefile.am | 4 | ||||
| -rw-r--r-- | libdimension/canvas.c | 16 | ||||
| -rw-r--r-- | libdimension/color.c | 16 | ||||
| -rw-r--r-- | libdimension/dimension.h | 16 | ||||
| -rw-r--r-- | libdimension/dimension/canvas.h | 16 | ||||
| -rw-r--r-- | libdimension/dimension/color.h | 16 | ||||
| -rw-r--r-- | libdimension/dimension/geometry.h | 16 | ||||
| -rw-r--r-- | libdimension/error.c | 16 | ||||
| -rw-r--r-- | libdimension/geometry.c | 16 | ||||
| -rw-r--r-- | libdimensionxx/Makefile.am | 26 | ||||
| -rw-r--r-- | libdimensionxx/dimensionxx.hpp | 29 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/error.c | 2 | ||||
| -rw-r--r-- | tests/png.c | 2 | ||||
| -rw-r--r-- | tests/warning.c | 2 |
20 files changed, 146 insertions, 90 deletions
diff --git a/Makefile.am b/Makefile.am index fa9b3b2..4e9f6bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ########################################################################### ## Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> ## ## ## -## This file is part of the Dimension Build Suite. ## +## This file is part of The Dimension Build Suite. ## ## ## ## The Dimension Build Suite is free software; you can redistribute it ## ## and/or modify it under the terms of the GNU General Public License as ## @@ -18,6 +18,6 @@ ########################################################################### ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libdimension libdimension-png tests +SUBDIRS = libdimension libdimension-png libdimensionxx tests EXTRA_DIST = autogen.sh diff --git a/configure.ac b/configure.ac index b952b41..03014f8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> dnl -dnl This file is part of the Dimension Build Suite. +dnl This file is part of The Dimension Build Suite. dnl dnl The Dimension Build Suite is free software; you can redistribute it dnl and/or modify it under the terms of the GNU General Public License as @@ -34,5 +34,6 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_FILES([Makefile libdimension/Makefile libdimension-png/Makefile + libdimensionxx/Makefile tests/Makefile]) AC_OUTPUT diff --git a/libdimension-png/Makefile.am b/libdimension-png/Makefile.am index f611ff9..cd82a66 100644 --- a/libdimension-png/Makefile.am +++ b/libdimension-png/Makefile.am @@ -1,7 +1,7 @@ ########################################################################### ## Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> ## ## ## -## This file is part of the Dimension Build Suite. ## +## This file is part of The Dimension Build Suite. ## ## ## ## The Dimension Build Suite is free software; you can redistribute it ## ## and/or modify it under the terms of the GNU General Public License as ## diff --git a/libdimension-png/dimension-png.h b/libdimension-png/dimension-png.h index 3c88c44..f8b4775 100644 --- a/libdimension-png/dimension-png.h +++ b/libdimension-png/dimension-png.h @@ -1,16 +1,16 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of Dimension. * + * This file is part of The Dimension Library. * * * - * Dimension is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as published * - * by the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * * * - * Dimension is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * * Lesser General Public License for more details. * * * * You should have received a copy of the GNU Lesser General Public * diff --git a/libdimension-png/png.c b/libdimension-png/png.c index 1c12dcf..2eb6a7d 100644 --- a/libdimension-png/png.c +++ b/libdimension-png/png.c @@ -1,16 +1,16 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of Dimension. * + * This file is part of The Dimension Library. * * * - * Dimension is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as published * - * by the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * * * - * Dimension is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * * Lesser General Public License for more details. * * * * You should have received a copy of the GNU Lesser General Public * diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am index 60c9347..fa508d8 100644 --- a/libdimension/Makefile.am +++ b/libdimension/Makefile.am @@ -1,7 +1,7 @@ ########################################################################### ## Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> ## ## ## -## This file is part of the Dimension Build Suite. ## +## This file is part of The Dimension Build Suite. ## ## ## ## The Dimension Build Suite is free software; you can redistribute it ## ## and/or modify it under the terms of the GNU General Public License as ## @@ -21,6 +21,6 @@ nobase_include_HEADERS = dimension.h dimension/geometry.h dimension/color.h dime lib_LTLIBRARIES = libdimension.la -libdimension_la_SOURCES = dimension.h dimension/geometry.h dimension/color.h dimension/canvas.h canvas.c color.c geometry.c error.c +libdimension_la_SOURCES = dimension.h dimension/geometry.h dimension/color.h dimension/canvas.h canvas.c color.c error.c geometry.c libdimension_la_LDFLAGS = -version-info 0:0:0 libdimension_la_LIBADD = -lm -lpthread diff --git a/libdimension/canvas.c b/libdimension/canvas.c index e56c391..257f1a9 100644 --- a/libdimension/canvas.c +++ b/libdimension/canvas.c @@ -1,16 +1,16 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of Dimension. * + * This file is part of The Dimension Library. * * * - * Dimension is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as published * - * by the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * * * - * Dimension is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * * Lesser General Public License for more details. * * * * You should have received a copy of the GNU Lesser General Public * diff --git a/libdimension/color.c b/libdimension/color.c index 25a6826..cea2675 100644 --- a/libdimension/color.c +++ b/libdimension/color.c @@ -1,16 +1,16 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of Dimension. * + * This file is part of The Dimension Library. * * * - * Dimension is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as published * - * by the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * * * - * Dimension is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * * Lesser General Public License for more details. * * * * You should have received a copy of the GNU Lesser General Public * diff --git a/libdimension/dimension.h b/libdimension/dimension.h index fa38629..22fb700 100644 --- a/libdimension/dimension.h +++ b/libdimension/dimension.h @@ -1,16 +1,16 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of Dimension. * + * This file is part of The Dimension Library. * * * - * Dimension is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as published * - * by the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * * * - * Dimension is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * * Lesser General Public License for more details. * * * * You should have received a copy of the GNU Lesser General Public * diff --git a/libdimension/dimension/canvas.h b/libdimension/dimension/canvas.h index d40ed1d..9a70327 100644 --- a/libdimension/dimension/canvas.h +++ b/libdimension/dimension/canvas.h @@ -1,16 +1,16 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of Dimension. * + * This file is part of The Dimension Library. * * * - * Dimension is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as published * - * by the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * * * - * Dimension is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * * Lesser General Public License for more details. * * * * You should have received a copy of the GNU Lesser General Public * diff --git a/libdimension/dimension/color.h b/libdimension/dimension/color.h index d637a81..0dade0f 100644 --- a/libdimension/dimension/color.h +++ b/libdimension/dimension/color.h @@ -1,16 +1,16 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of Dimension. * + * This file is part of The Dimension Library. * * * - * Dimension is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as published * - * by the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * * * - * Dimension is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * * Lesser General Public License for more details. * * * * You should have received a copy of the GNU Lesser General Public * diff --git a/libdimension/dimension/geometry.h b/libdimension/dimension/geometry.h index 6493407..26705ca 100644 --- a/libdimension/dimension/geometry.h +++ b/libdimension/dimension/geometry.h @@ -1,16 +1,16 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of Dimension. * + * This file is part of The Dimension Library. * * * - * Dimension is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as published * - * by the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * * * - * Dimension is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * * Lesser General Public License for more details. * * * * You should have received a copy of the GNU Lesser General Public * diff --git a/libdimension/error.c b/libdimension/error.c index b91c192..1705a34 100644 --- a/libdimension/error.c +++ b/libdimension/error.c @@ -1,16 +1,16 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of Dimension. * + * This file is part of The Dimension Library. * * * - * Dimension is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as published * - * by the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * * * - * Dimension is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * * Lesser General Public License for more details. * * * * You should have received a copy of the GNU Lesser General Public * diff --git a/libdimension/geometry.c b/libdimension/geometry.c index c6909f4..5786f57 100644 --- a/libdimension/geometry.c +++ b/libdimension/geometry.c @@ -1,16 +1,16 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of Dimension. * + * This file is part of The Dimension Library. * * * - * Dimension is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as published * - * by the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * * * - * Dimension is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * * Lesser General Public License for more details. * * * * You should have received a copy of the GNU Lesser General Public * diff --git a/libdimensionxx/Makefile.am b/libdimensionxx/Makefile.am new file mode 100644 index 0000000..60608e4 --- /dev/null +++ b/libdimensionxx/Makefile.am @@ -0,0 +1,26 @@ +########################################################################### +## Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> ## +## ## +## This file is part of The Dimension Build Suite. ## +## ## +## The Dimension Build Suite is free software; you can redistribute it ## +## and/or modify it under the terms of the GNU General Public License as ## +## published by the Free Software Foundation; either version 3 of the ## +## License, or (at your option) any later version. ## +## ## +## The Dimension Build Suite is distributed in the hope that it will be ## +## useful, but WITHOUT ANY WARRANTY; without even the implied warranty ## +## of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## +## General Public License for more details. ## +## ## +## You should have received a copy of the GNU General Public License ## +## along with this program. If not, see <http://www.gnu.org/licenses/>. ## +########################################################################### + +nobase_include_HEADERS = dimensionxx.hpp dimensionxx/geometry.hpp dimensionxx/color.hpp dimensionxx/canvas.hpp + +lib_LTLIBRARIES = libdimensionxx.la + +libdimensionxx_la_SOURCES = dimensionxx.hpp dimensionxx/geometry.hpp dimensionxx/color.hpp dimensionxx/canvas.hpp canvas.cpp color.cpp geometry.cpp +libdimensionxx_la_LDFLAGS = -version-info 0:0:0 +libdimensionxx_la_LIBADD = ../libdimension/libdimension.la ../libdimension-png/libdimension-png.la diff --git a/libdimensionxx/dimensionxx.hpp b/libdimensionxx/dimensionxx.hpp new file mode 100644 index 0000000..a9e89d8 --- /dev/null +++ b/libdimensionxx/dimensionxx.hpp @@ -0,0 +1,29 @@ +/************************************************************************* + * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * + * * + * This file is part of The Dimension Library. * + * * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this program. If not, see * + * <http://www.gnu.org/licenses/>. * + *************************************************************************/ + +#ifndef DIMENSIONXX_HPP +#define DIMENSIONXX_HPP + +/* More includes */ +#include <dimensionxx/geometry.hpp> +#include <dimensionxx/color.hpp> +#include <dimensionxx/canvas.hpp> + +#endif /* DIMENSIONXX_HPP */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 9c9c4ed..f23b469 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,7 @@ ########################################################################### ## Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> ## ## ## -## This file is part of the Dimension Build Suite. ## +## This file is part of The Dimension Build Suite. ## ## ## ## The Dimension Build Suite is free software; you can redistribute it ## ## and/or modify it under the terms of the GNU General Public License as ## diff --git a/tests/error.c b/tests/error.c index 1c6fcbd..fc42476 100644 --- a/tests/error.c +++ b/tests/error.c @@ -1,7 +1,7 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of the Dimension Test Suite. * + * This file is part of The Dimension Test Suite. * * * * Dimension is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published * diff --git a/tests/png.c b/tests/png.c index 3ebda35..5b3f8c9 100644 --- a/tests/png.c +++ b/tests/png.c @@ -1,7 +1,7 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of the Dimension Test Suite. * + * This file is part of The Dimension Test Suite. * * * * Dimension is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published * diff --git a/tests/warning.c b/tests/warning.c index c3f5b4c..55735c4 100644 --- a/tests/warning.c +++ b/tests/warning.c @@ -1,7 +1,7 @@ /************************************************************************* * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * * * - * This file is part of the Dimension Test Suite. * + * This file is part of The Dimension Test Suite. * * * * Dimension is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published * |