fanwuyang/ence260-othello
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Emit -I. for same dir

Browse Source
This commit is contained in:
Michael Hayes
2011-08-30 09:09:11 +00:00
parent 30d0cf4164
commit a0e7c89fb6
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/hello1/Makefile
+1 -1
View File
@@ -5,7 +5,7 @@
# Definitions. # Definitions.
CC = avr-gcc CC = avr-gcc
CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I -I../../drivers -I../../drivers/avr -I../../utils CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers -I../../drivers/avr -I../../utils
OBJCOPY = avr-objcopy OBJCOPY = avr-objcopy
SIZE = avr-size SIZE = avr-size
DEL = rm DEL = rm
apps/space10/Makefile
+1 -1
View File
@@ -5,7 +5,7 @@
# Definitions. # Definitions.
CC = avr-gcc CC = avr-gcc
CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils
OBJCOPY = avr-objcopy OBJCOPY = avr-objcopy
SIZE = avr-size SIZE = avr-size
DEL = rm DEL = rm
apps/space11/Makefile
+1 -1
View File
@@ -5,7 +5,7 @@
# Definitions. # Definitions.
CC = avr-gcc CC = avr-gcc
CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils
OBJCOPY = avr-objcopy OBJCOPY = avr-objcopy
SIZE = avr-size SIZE = avr-size
DEL = rm DEL = rm
apps/space9/Makefile
+1 -1
View File
@@ -5,7 +5,7 @@
# Definitions. # Definitions.
CC = avr-gcc CC = avr-gcc
CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers -I../../fonts -I../../drivers/avr -I../../utils
OBJCOPY = avr-objcopy OBJCOPY = avr-objcopy
SIZE = avr-size SIZE = avr-size
DEL = rm DEL = rm
etc/makemake.py
+16 -8
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
"""makemake V0.09 """makemake V0.10
Copyright (c) 2010 Michael P. Hayes, UC ECE, NZ Copyright (c) 2010 Michael P. Hayes, UC ECE, NZ
This program tries to make a Makefile from a template. Given a C file This program tries to make a Makefile from a template. Given a C file
@@ -122,6 +122,19 @@ def hfiles_get_all (filedeps):
return files_get_all (filedeps, '.h') return files_get_all (filedeps, '.h')
def paths_prune (filelist):
relpaths = unique ([os.path.dirname (os.path.relpath (path)) for path in filelist])
relpaths = unique (relpaths)
if '' in relpaths:
relpaths.remove ('')
relpaths.insert (0, '.')
return relpaths
def file_parse (pathname, indent, debug): def file_parse (pathname, indent, debug):
if debug: if debug:
@@ -162,13 +175,8 @@ def makefile_print (options, template, maincfilename, filedeps,
hfilelist = hfiles_get_all (filedeps) hfilelist = hfiles_get_all (filedeps)
includedirs = unique ([os.path.dirname (os.path.relpath (path)) for path in hfilelist]) includedirs = paths_prune (hfilelist)
moduledirs = paths_prune (cfilelist)
moduledirs = unique ([os.path.dirname (os.path.relpath (path)) for path in cfilelist])
if options.debug:
print >> sys.stderr, includedirs
print >> sys.stderr, moduledirs
vpath = ' '.join (moduledirs) vpath = ' '.join (moduledirs)
includes = '-I' + ' -I'.join (includedirs) includes = '-I' + ' -I'.join (includedirs)