* 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
parent
ad1d049af9
commit
c14ae835c5
|
|
@ -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>
|
||||
|
||||
* include/windows.h: Don't include basetyps.h.
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@ SHELL = @SHELL@
|
|||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
build_alias = @build_alias@
|
||||
host_alias = @host_alias@
|
||||
target_alias = @target_alias@
|
||||
build_alias = @build@
|
||||
host_alias = @host@
|
||||
target_alias = @target@
|
||||
prefix = @prefix@
|
||||
conf_prefix = @prefix@
|
||||
|
||||
|
|
|
|||
3023
winsup/w32api/configure
vendored
3023
winsup/w32api/configure
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -19,6 +19,7 @@ dnl check for cc and CFLAGS
|
|||
CFLAGS=${CFLAGS-"-O2 -g"}
|
||||
AC_CHECK_TOOL(CC, gcc, gcc)
|
||||
AC_SUBST(CC)
|
||||
AC_SUBST(CFLAGS)
|
||||
|
||||
dnl check for various tools
|
||||
AC_CHECK_TOOL(AR, ar, ar)
|
||||
|
|
@ -46,4 +47,4 @@ else
|
|||
fi
|
||||
AC_SUBST(BUILDENV)
|
||||
|
||||
AC_OUTPUT(Makefile lib/Makefile)
|
||||
AC_OUTPUT(Makefile lib/Makefile lib/ddk/Makefile)
|
||||
|
|
|
|||
|
|
@ -15,9 +15,12 @@ SHELL = @SHELL@
|
|||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
host_alias = @host_alias@
|
||||
build_alias = @build_alias@
|
||||
target_alias = @target_alias@
|
||||
SUBDIRS := ddk
|
||||
subdirs := ddk
|
||||
|
||||
host_alias = @host@
|
||||
build_alias = @build@
|
||||
target_alias = @target@
|
||||
prefix = @prefix@
|
||||
includedir:=@includedir@
|
||||
|
||||
|
|
@ -82,6 +85,21 @@ RANLIB = @RANLIB@
|
|||
AR = @AR@
|
||||
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
|
||||
|
||||
# headers
|
||||
|
|
@ -105,7 +123,15 @@ DISTFILES = Makefile.in $(DEF_FILES) $(SOURCES)
|
|||
.NOTPARALLEL:
|
||||
|
||||
# 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 \
|
||||
-Wall -pedantic -Wsystem-headers -c $(srcdir)/test.c -o test.o
|
||||
|
|
@ -146,8 +172,9 @@ lib%.a: %.o
|
|||
$(AR) rc $@ $*.o
|
||||
$(RANLIB) $@
|
||||
|
||||
.PHONY: install install-libraries install-headers install-pdk
|
||||
# install headers and libraries in a target specified directory.
|
||||
install: install-libraries install-headers
|
||||
install: install-libraries install-headers install-ddk
|
||||
|
||||
install-libraries: all
|
||||
$(mkinstalldirs) $(inst_libdir)
|
||||
|
|
@ -165,8 +192,11 @@ install-headers:
|
|||
$(INSTALL_DATA) $(srcdir)/../include/GL/$$i $(inst_includedir)/GL/$$i ; \
|
||||
done
|
||||
|
||||
install-ddk: install-libraries install-headers
|
||||
(cd ddk; $(MAKE) install)
|
||||
|
||||
# uninstall headers and libraries from a target specified directory
|
||||
uninstall: uninstall-libraries uninstall-headers
|
||||
uninstall: uninstall-pdk uninstall-libraries uninstall-headers
|
||||
|
||||
uninstall-libraries:
|
||||
@for i in $(LIBS); do \
|
||||
|
|
@ -180,6 +210,8 @@ uninstall-headers:
|
|||
done
|
||||
rmdir $(inst_includedir)
|
||||
|
||||
uninstall-pdk:
|
||||
cd ddk && $(MAKE) -C uninstall
|
||||
|
||||
dist:
|
||||
mkdir $(distdir)/include
|
||||
|
|
@ -208,3 +240,4 @@ distclean: clean
|
|||
rm -f config.cache config.status config.log Makefile
|
||||
|
||||
maintainer-clean: distclean
|
||||
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@ SHELL = @SHELL@
|
|||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
host_alias = @host_alias@
|
||||
build_alias = @build_alias@
|
||||
target_alias = @target_alias@
|
||||
host_alias = @host@
|
||||
build_alias = @build@
|
||||
target_alias = @target@
|
||||
prefix = @prefix@
|
||||
includedir:=@includedir@
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ LD = @LD@
|
|||
|
||||
# headers
|
||||
|
||||
HEADERS = $(notdir $(wildcard $(srcdir)/../include/*.h))
|
||||
HEADERS = $(notdir $(wildcard $(srcdir)/../../include/ddk/*.h))
|
||||
|
||||
# libraries
|
||||
|
||||
|
|
@ -147,7 +147,7 @@ install-libraries: all
|
|||
install-headers:
|
||||
$(mkinstalldirs) $(inst_includedir)
|
||||
for i in $(HEADERS); do \
|
||||
$(INSTALL_DATA) $(srcdir)/../../ddk/include/$$i $(inst_includedir)/$$i ; \
|
||||
$(INSTALL_DATA) $(srcdir)/../../include/ddk/$$i $(inst_includedir)/$$i ; \
|
||||
done
|
||||
|
||||
# uninstall headers and libraries from a target specified directory
|
||||
|
|
|
|||
Loading…
Reference in a new issue