diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-12-20 17:44:37 -0800 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-12-20 17:44:37 -0800 |
| commit | ed70195c7eda1040e596c3f7a1a417d4ec888242 (patch) | |
| tree | 9bcbcddd51fde2a75aaa3aa5cb1cb61a5a5fc4e5 /Makefile.in | |
| parent | 739e529416c3917d1e75d1a41850762a327e6ea9 (diff) | |
| parent | e38217683c65f53fcaa3b6a5daedb6b23b408a90 (diff) | |
Merge branch 'master' into ast
Conflicts:
function.cpp
parser.cpp
parser.h
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 93745633..1bca5991 100644 --- a/Makefile.in +++ b/Makefile.in @@ -11,7 +11,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # # @@ -160,11 +160,6 @@ HDR_FILES := $(HDR_FILES_SRC:.hdr.in=.hdr) # Use a pattern rule so that Make knows to only issue one invocation # per http://www.gnu.org/software/make/manual/make.html#Pattern-Intro -# Internalized scripts are currently disabled. -# For now, we just generate empty arrays. -# To generate them again, you would run this: -# ./internalize_scripts.py share/functions/*.fish share/completions/*.fish - # # Files containing documentation for external commands. @@ -775,7 +770,6 @@ distclean: clean clean: rm -f *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.cpp doc_src/*.o doc_src/commands.hdr - rm -f $(GENERATED_INTERN_SCRIPT_FILES) rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt rm -f $(PROGRAMS) fish_tests key_reader rm -f command_list.txt command_list_toc.txt toc.txt |