diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-23 01:42:20 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-23 01:42:20 +0000 |
commit | ba69f7e7611d2998d783f8224d2d5f8aa10dde58 (patch) | |
tree | e1b5877caa73809fc4a938281904534fbe6cf4c5 | |
parent | 3524e9a2ad84254248b3b495246dd91b1c99e760 (diff) | |
download | nuttx-ba69f7e7611d2998d783f8224d2d5f8aa10dde58.tar.gz nuttx-ba69f7e7611d2998d783f8224d2d5f8aa10dde58.tar.bz2 nuttx-ba69f7e7611d2998d783f8224d2d5f8aa10dde58.zip |
Fix 'make export' target for NxWM
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4766 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r-- | NxWidgets/nxwm/COPYING | 41 | ||||
-rw-r--r-- | NxWidgets/nxwm/Makefile | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | nuttx/COPYING | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | nuttx/README.txt | 0 |
4 files changed, 44 insertions, 5 deletions
diff --git a/NxWidgets/nxwm/COPYING b/NxWidgets/nxwm/COPYING new file mode 100644 index 000000000..4273aec03 --- /dev/null +++ b/NxWidgets/nxwm/COPYING @@ -0,0 +1,41 @@ +COPYING -- Describes the terms under which NxWM is distributed. A +copy of the BSD-style licensing is included in this file. In my +words -- I believe that you should free to use NxWM in any +environment, private, private, commercial, open, closed, etc. +provided only that you repect the modest copyright notices as +described in license (below). Please feel free to contact me if you +have any licensing concerns. + +/************************************************************************* + * + * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name NuttX, NxWidgets, NxWM nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * 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. + * + *************************************************************************/ diff --git a/NxWidgets/nxwm/Makefile b/NxWidgets/nxwm/Makefile index 6b2e4ce77..4d4ecb4d2 100644 --- a/NxWidgets/nxwm/Makefile +++ b/NxWidgets/nxwm/Makefile @@ -42,7 +42,6 @@ NXWIDGETDIR := $(NXWMDIR)/../libnxwidgets ASRCS = CSRCS = - # Window Manager CXXSRCS = capplicationwindow.cxx cfullscreenwindow.cxx ctaskbar.cxx cwindowmessenger.cxx @@ -64,7 +63,6 @@ ifeq ($(CONFIG_NXWM_TOUCHSCREEN),y) CXXSRCS += ccalibration.cxx endif - # Images CXXSRCS += glyph_calculator.cxx glyph_calibration.cxx glyph_cmd.cxx CXXSRCS += glyph_minimize.cxx glyph_nsh.cxx glyph_play.cxx glyph_start.cxx @@ -140,6 +138,6 @@ distclean: clean @rm -f Make.dep .depend export: $(BIN) - zip -r nxwidgets-export.zip include $(BIN) COPYING + zip -r nxwm-export.zip include $(BIN) COPYING -include Make.dep diff --git a/nuttx/COPYING b/nuttx/COPYING index c9b228fc9..80fa48897 100755..100644 --- a/nuttx/COPYING +++ b/nuttx/COPYING @@ -12,8 +12,8 @@ NuttX License for NuttX in general (authorship of individual files may vary): /************************************************************************* * - * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/README.txt b/nuttx/README.txt index 523bcc782..523bcc782 100755..100644 --- a/nuttx/README.txt +++ b/nuttx/README.txt |