diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2015-11-09 15:05:36 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2015-11-09 15:05:36 +0800 |
| commit | c2254537345aa1220a101393b903627ea4c70959 (patch) | |
| tree | a8910b02d0ee6078d5385a346b1071dcf3387482 | |
| parent | 278478c027b75e3716ef5a21ecca332f3d671a8a (diff) | |
| download | compiler2015-c2254537345aa1220a101393b903627ea4c70959.tar.gz compiler2015-c2254537345aa1220a101393b903627ea4c70959.tar.zst compiler2015-c2254537345aa1220a101393b903627ea4c70959.zip | |
Move all source files to the new src directory
| -rw-r--r-- | Makefile.am | 24 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/lexer.l (renamed from lexer.l) | 0 | ||||
| -rw-r--r-- | src/main.c (renamed from main.c) | 0 | ||||
| -rw-r--r-- | src/symbol-table.c (renamed from symbol-table.c) | 0 | ||||
| -rw-r--r-- | src/symbol-table.h (renamed from symbol-table.h) | 0 |
6 files changed, 14 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 95190d9..8ff35f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,22 +7,24 @@ EXTRA_DIST = autogen.sh Makefile.simple bin_PROGRAMS = scanner noinst_LIBRARIES = liblexer.a +AM_CPPFLAGS = -I$(top_srcdir)/src + scanner_CFLAGS = $(WARN_CFLAGS) -scanner_SOURCES = \ - main.c \ - lexer.h \ - symbol-table.h \ - symbol-table.c \ +scanner_SOURCES = \ + lexer.h \ + src/main.c \ + src/symbol-table.h \ + src/symbol-table.c \ $(NULL) -scanner_LDADD = \ - liblexer.a \ +scanner_LDADD = \ + liblexer.a \ $(NULL) liblexer_a_LFLAGS = --header-file=lexer.h -liblexer_a_SOURCES = \ - lexer.l \ +liblexer_a_SOURCES = \ + src/lexer.l \ $(NULL) -lexer.h: liblexer_a-lexer.c +lexer.h: src/liblexer_a-lexer.c BUILT_SOURCES = lexer.h @@ -32,7 +34,7 @@ submit: dist tar -zxf $(DIST_ARCHIVES) mv $(distdir) $(submit_dir_name) cp -a $(submit_dir_name)/Makefile.simple $(submit_dir_name)/Makefile - rm $(submit_dir_name)/liblexer_a-lexer.c + rm $(submit_dir_name)/src/liblexer_a-lexer.c rm $(submit_dir_name)/lexer.h ver=`git rev-list HEAD | wc -l` && tar -jpcf \ $(submit_tarball_prefix)_ver$$ver.tar.bz2 $(submit_dir_name) diff --git a/configure.ac b/configure.ac index e334132..a303ded 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT([ccmmc], [0.1]) AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([lexer.l]) +AC_CONFIG_SRCDIR([src/lexer.l]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign subdir-objects]) diff --git a/symbol-table.c b/src/symbol-table.c index 08a1859..08a1859 100644 --- a/symbol-table.c +++ b/src/symbol-table.c diff --git a/symbol-table.h b/src/symbol-table.h index b1e5a3f..b1e5a3f 100644 --- a/symbol-table.h +++ b/src/symbol-table.h |