Added $(CFLAGS) and $(LDFLAGS) in various places
This commit is contained in:
parent
9f5b33a627
commit
a95dbbad21
14
Makefile.in
14
Makefile.in
|
@ -69,18 +69,20 @@ SCM_CONFIG_FILES = scheme/xlib/xlib-interfaces.scm \
|
|||
|
||||
PACKAGES = xlib xpm
|
||||
|
||||
enough: $(SCX)
|
||||
|
||||
$(SCX_VM): tmpmain.o $(OBJECTS)
|
||||
$(CC) -o $(SCX_VM) $(LIB_DIRS) tmpmain.o $(OBJECTS) $(LIBS)
|
||||
$(CC) $(LDFLAGS) $(CFLAGS) -o $(SCX_VM) $(LIB_DIRS) tmpmain.o $(OBJECTS) $(LIBS)
|
||||
|
||||
$(OBJECTS): c/xlib/xlib.h
|
||||
.c.o:
|
||||
$(CC) -c $(INCLUDES) -o $@ $<
|
||||
$(CC) $(CFLAGS) -c $(INCLUDES) -o $@ $<
|
||||
|
||||
tmpmain.o: c/main.c
|
||||
$(CC) -c -DSCSHIMAGE=\"$(SCSH_LIB)/scsh.image\" $(INCLUDES) -o $@ $<
|
||||
$(CC) -c -DSCSHIMAGE=\"$(SCSH_LIB)/scsh.image\" $(INCLUDES) $(CFLAGS) -o $@ $<
|
||||
|
||||
main.o: c/main.c
|
||||
$(CC) -c -DSCSHIMAGE=\"`pwd`/scx.image\" $(INCLUDES) -o $@ $<
|
||||
$(CC) -c -DSCSHIMAGE=\"`pwd`/scx.image\" $(INCLUDES) $(CFLAGS) -o $@ $<
|
||||
|
||||
|
||||
### Making the Image
|
||||
|
@ -102,7 +104,7 @@ $(SCX_IMAGE): $(SCX_VM) $(SCM_FILES) $(SCM_CONFIG_FILES)
|
|||
# echo ",load-package xpm"; \
|
||||
|
||||
$(SCX): $(SCX_IMAGE) main.o $(OBJECTS)
|
||||
$(CC) -o $@ $(LIB_DIRS) main.o $(OBJECTS) $(LIBS)
|
||||
$(CC) $(LDFLAGS) -o $@ $(LIB_DIRS) main.o $(OBJECTS) $(LIBS)
|
||||
|
||||
# --------------------
|
||||
# Distribution...
|
||||
|
@ -110,7 +112,7 @@ $(SCX): $(SCX_IMAGE) main.o $(OBJECTS)
|
|||
distdir = /tmp
|
||||
|
||||
# DISTFILES should include all sources.
|
||||
DISTFILES = COPYRIGHT configure configure.in Makefile.in \
|
||||
DISTFILES = COPYRIGHT INSTALL configure configure.in Makefile.in \
|
||||
$(SCM_FILES) $(SCM_CONFIG_FILES) $(OBJECTS:.o=.c) \
|
||||
c/main.c c/xlib/xlib.h
|
||||
|
||||
|
|
Loading…
Reference in New Issue