drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Makefile.in: Add components for lib/ddk. Adjust for autoconf-2.53. 

* configure.in: Ditto.
	* lib/Makefile.in: Ditto.
	* lib/ddk/Makefile.in: Correct installation procedure.  Adjust for
	autoconf-2.53.
	* configure: Regenerate.
This commit is contained in:
Earnie Boyd 2002-10-14 19:59:04 +00:00
parent ad1d049af9
commit c14ae835c5
6 changed files with 2193 additions and 903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/w32api/ChangeLog
View File

@ -1,3 +1,12 @@
2002-10-14 Earnie Boyd <earnie@users.sf.net>
* Makefile.in: Add components for lib/ddk. Adjust for autoconf-2.53.
* configure.in: Ditto.
* lib/Makefile.in: Ditto.
* lib/ddk/Makefile.in: Correct installation procedure. Adjust for
autoconf-2.53.
* configure: Regenerate.
2002-10-14 Danny Smith <dannysmith@users.sourceforge.net> 2002-10-14 Danny Smith <dannysmith@users.sourceforge.net>
* include/windows.h: Don't include basetyps.h. * include/windows.h: Don't include basetyps.h.

6
winsup/w32api/Makefile.in
View File

@ -14,9 +14,9 @@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
build_alias = @build_alias@ build_alias = @build@
host_alias = @host_alias@ host_alias = @host@
target_alias = @target_alias@ target_alias = @target@
prefix = @prefix@ prefix = @prefix@
conf_prefix = @prefix@ conf_prefix = @prefix@

3023
winsup/w32api/configure vendored
View File

File diff suppressed because it is too large Load Diff

3
winsup/w32api/configure.in
View File

@ -19,6 +19,7 @@ dnl check for cc and CFLAGS
CFLAGS=${CFLAGS-"-O2 -g"} CFLAGS=${CFLAGS-"-O2 -g"}
AC_CHECK_TOOL(CC, gcc, gcc) AC_CHECK_TOOL(CC, gcc, gcc)
AC_SUBST(CC) AC_SUBST(CC)
AC_SUBST(CFLAGS)
dnl check for various tools dnl check for various tools
AC_CHECK_TOOL(AR, ar, ar) AC_CHECK_TOOL(AR, ar, ar)
@ -46,4 +47,4 @@ else
fi fi
AC_SUBST(BUILDENV) AC_SUBST(BUILDENV)
AC_OUTPUT(Makefile lib/Makefile) AC_OUTPUT(Makefile lib/Makefile lib/ddk/Makefile)

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

@ -15,9 +15,12 @@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
host_alias = @host_alias@ SUBDIRS := ddk
build_alias = @build_alias@ subdirs := ddk
target_alias = @target_alias@
host_alias = @host@
build_alias = @build@
target_alias = @target@
prefix = @prefix@ prefix = @prefix@
includedir:=@includedir@ includedir:=@includedir@
@ -82,6 +85,21 @@ 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
@ -105,7 +123,15 @@ DISTFILES = Makefile.in $(DEF_FILES) $(SOURCES)
.NOTPARALLEL: .NOTPARALLEL:
# targets # targets
all: $(LIBS) $(EXTRA_OBJS) all: $(LIBS) $(EXTRA_OBJS) ddk
%-subdirs:
for i in $(SUBDIRS); do \
$(MAKE) $(FLAGS_TO_PASS) -C $$i $*; \
done
ddk:
$(MAKE) $(FLAGS_TO_PASS) -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
@ -146,8 +172,9 @@ lib%.a: %.o
$(AR) rc $@ $*.o $(AR) rc $@ $*.o
$(RANLIB) $@ $(RANLIB) $@
.PHONY: install install-libraries install-headers install-pdk
# install headers and libraries in a target specified directory. # install headers and libraries in a target specified directory.
install: install-libraries install-headers install: install-libraries install-headers install-ddk
install-libraries: all install-libraries: all
$(mkinstalldirs) $(inst_libdir) $(mkinstalldirs) $(inst_libdir)
@ -165,8 +192,11 @@ install-headers:
$(INSTALL_DATA) $(srcdir)/../include/GL/$$i $(inst_includedir)/GL/$$i ; \ $(INSTALL_DATA) $(srcdir)/../include/GL/$$i $(inst_includedir)/GL/$$i ; \
done done
install-ddk: install-libraries install-headers
(cd ddk; $(MAKE) install)
# uninstall headers and libraries from a target specified directory # uninstall headers and libraries from a target specified directory
uninstall: uninstall-libraries uninstall-headers uninstall: uninstall-pdk uninstall-libraries uninstall-headers
uninstall-libraries: uninstall-libraries:
@for i in $(LIBS); do \ @for i in $(LIBS); do \
@ -180,6 +210,8 @@ uninstall-headers:
done done
rmdir $(inst_includedir) rmdir $(inst_includedir)
uninstall-pdk:
cd ddk && $(MAKE) -C uninstall
dist: dist:
mkdir $(distdir)/include mkdir $(distdir)/include
@ -208,3 +240,4 @@ distclean: clean
rm -f config.cache config.status config.log Makefile rm -f config.cache config.status config.log Makefile
maintainer-clean: distclean maintainer-clean: distclean

10
winsup/w32api/lib/ddk/Makefile.in
View File

@ -14,9 +14,9 @@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
host_alias = @host_alias@ host_alias = @host@
build_alias = @build_alias@ build_alias = @build@
target_alias = @target_alias@ target_alias = @target@
prefix = @prefix@ prefix = @prefix@
includedir:=@includedir@ includedir:=@includedir@
@ -85,7 +85,7 @@ LD = @LD@
# headers # headers
HEADERS = $(notdir $(wildcard $(srcdir)/../include/*.h)) HEADERS = $(notdir $(wildcard $(srcdir)/../../include/ddk/*.h))
# libraries # libraries
@ -147,7 +147,7 @@ install-libraries: all
install-headers: install-headers:
$(mkinstalldirs) $(inst_includedir) $(mkinstalldirs) $(inst_includedir)
for i in $(HEADERS); do \ for i in $(HEADERS); do \
$(INSTALL_DATA) $(srcdir)/../../ddk/include/$$i $(inst_includedir)/$$i ; \ $(INSTALL_DATA) $(srcdir)/../../include/ddk/$$i $(inst_includedir)/$$i ; \
done done
# uninstall headers and libraries from a target specified directory # uninstall headers and libraries from a target specified directory