JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct makefile error; remove unnecessary FLAGS_TO_PASS macro

Browse Source
This commit is contained in:
Keith Marshall 2011-12-12 20:02:33 +00:00
parent 735415570a
commit 1e10d23a56
3 changed files with 36 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/w32api/ChangeLog
View File

@ -1,3 +1,14 @@
2011-12-12 Keith Marshall <keithmarshall@users.sf.net>
* Makefile.in (FLAGS_TO_PASS): Pointless macro; remove it. (Defaults
for all are propagated by configure, and make automatically propagates
any user specified overrides.
* lib/Makefile.in (FLAGS_TO_PASS): Similarly removed, as pointless.
(uninstall-ddk, uninstall-directx): Remove improperly used '-C' from
make command; the directory to process was previously selected by cd,
and not properly specified as argument to '-C'.
2011-12-10 Keith Marshall <keithmarshall@users.sf.net> 2011-12-10 Keith Marshall <keithmarshall@users.sf.net>
* aclocal.m4: Redundant file; delete it. * aclocal.m4: Redundant file; delete it.

35
winsup/w32api/Makefile.in
View File

@ -1,11 +1,13 @@
# @configure_input@
# #
# Makefile.in
# #
# This file is part of a free library for the Win32 API. # Makefile.in
# #
# This library is distributed in the hope that it will be useful, # This file is part of a free library for the Win32 API.
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# start config section # start config section
@ -48,21 +50,6 @@ TAR = tar
TARFLAGS = --lzma - TARFLAGS = --lzma -
TARFILEEXT = .tar.lzma TARFILEEXT = .tar.lzma
FLAGS_TO_PASS = \
AS="$(AS)" \
CC="$(CC)" \
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
AR="$(AR)" \
RANLIB="$(RANLIB)" \
LD="$(LD)" \
DLLTOOL="$(DLLTOOL)" \
TAR="$(TAR)" \
TARFLAGS="$(TARFLAGS)" \
TARFILEEXT="$(TARFILEEXT)" \
WINDRES="$(WINDRES)"
# end config section # end config section
SUBDIRS = lib SUBDIRS = lib
@ -79,18 +66,18 @@ all: lib
%-subdirs: %-subdirs:
for i in $(SUBDIRS); do \ for i in $(SUBDIRS); do \
$(MAKE) $(FLAGS_TO_PASS) -C $$i $*; \ $(MAKE) -C $$i $*; \
done done
lib: lib:
$(MAKE) $(FLAGS_TO_PASS) -C $@ $(MAKE) -C $@
test: test:
$(MAKE) -C lib test $(FLAGS_TO_PASS) $(MAKE) -C lib test
install uninstall: install uninstall:
for i in $(SUBDIRS); do \ for i in $(SUBDIRS); do \
(cd $$i; $(MAKE) $@ $(FLAGS_TO_PASS)); \ (cd $$i; $(MAKE) $@); \
done done
ifdef SNAPDATE ifdef SNAPDATE

41
winsup/w32api/lib/Makefile.in
View File

@ -1,11 +1,13 @@
# @configure_input@
# #
# Makefile.in
# #
# This file is part of a free library for the Win32 API. # Makefile.in
# #
# This library is distributed in the hope that it will be useful, # This file is part of a free library for the Win32 API.
# but WITHOUT ANY WARANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# start config section # start config section
@ -91,21 +93,6 @@ RANLIB = @RANLIB@
AR = @AR@ AR = @AR@
LD = @LD@ LD = @LD@
FLAGS_TO_PASS = \
AS="$(AS)" \
CC="$(CC)" \
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
AR="$(AR)" \
RANLIB="$(RANLIB)" \
LD="$(LD)" \
DLLTOOL="$(DLLTOOL)" \
TAR="$(TAR)" \
TARFLAGS="$(TARFLAGS)" \
TARFILEEXT="$(TARFILEEXT)" \
WINDRES="$(WINDRES)"
# end config section # end config section
# headers # headers
@ -148,14 +135,14 @@ all: $(EXTRA_OBJS) $(LIBS) ddk directx
%-subdirs: %-subdirs:
for i in $(SUBDIRS); do \ for i in $(SUBDIRS); do \
$(MAKE) $(FLAGS_TO_PASS) -C $$i $*; \ $(MAKE) -C $$i $*; \
done done
ddk: ddk:
$(MAKE) $(FLAGS_TO_PASS) -C $@ $(MAKE) -C $@
directx: directx:
$(MAKE) $(FLAGS_TO_PASS) -C $@ $(MAKE) -C $@
TEST_OPTIONS = $(ALL_CFLAGS) -DWINVER=0x0666 \ TEST_OPTIONS = $(ALL_CFLAGS) -DWINVER=0x0666 \
-Wall -pedantic -Wsystem-headers -c $(srcdir)/test.c -o test.o -Wall -pedantic -Wsystem-headers -c $(srcdir)/test.c -o test.o
@ -246,10 +233,10 @@ install-headers: $(need-DESTDIR-compatibility)
done done
install-ddk: install-libraries install-headers install-ddk: install-libraries install-headers
cd ddk && $(MAKE) install $(FLAGS_TO_PASS) cd ddk && $(MAKE) install
install-directx: install-libraries install-headers install-directx: install-libraries install-headers
cd directx && $(MAKE) install $(FLAGS_TO_PASS) cd directx && $(MAKE) install
# uninstall headers and libraries from a target specified directory # uninstall headers and libraries from a target specified directory
uninstall: uninstall-ddk uninstall-directx uninstall-libraries uninstall-headers uninstall: uninstall-ddk uninstall-directx uninstall-libraries uninstall-headers
@ -267,10 +254,10 @@ uninstall-headers: $(need-DESTDIR-compatibility)
rmdir $(DESTDIR)$(inst_includedir) rmdir $(DESTDIR)$(inst_includedir)
uninstall-ddk: uninstall-ddk:
cd ddk && $(MAKE) -C uninstall $(FLAGS_TO_PASS) cd ddk && $(MAKE) uninstall
uninstall-directx: uninstall-directx:
cd directx && $(MAKE) -C uninstall $(FLAGS_TO_PASS) cd directx && $(MAKE) uninstall
dist: dist:
mkdir $(distdir)/include mkdir $(distdir)/include