diff options
author | Luke Dunstan <infidel@users.sourceforge.net> | 2004-03-27 05:25:37 +0300 |
---|---|---|
committer | Luke Dunstan <infidel@users.sourceforge.net> | 2004-03-27 05:25:37 +0300 |
commit | fec932591db5b95ba8bff638739e9ae112afd2d0 (patch) | |
tree | e5872c79fc8617b884328d3e6fd9ba8c59130576 /winsup/w32api/lib/Makefile.in | |
parent | deb7bf284a299c865f951c428f195bbdd2052b8a (diff) |
2004-03-27 Filip Navara <xnavara@volny.cz>
* include/directx: New subdir.
* lib/directx: Ditto.
* include/directx/(d3d9.h, d3d9caps.h, d3d9types.h, dxerr8.h,
dxerr9.h): New files.
* lib/ddk/(Makefile.in, d3d8.def, d3d9.def, d3dim.def, d3drm.def,
d3dx8d.def, d3dx9d.def, d3dxof.def, ddraw.def, dinput.def,
dinput_joy.c, dinput_joy2.c, dinput_kbd.c, dinput_mouse.c,
dinput_mouse2.c, dinput_private.h, dinput8.def, dmoguids.c, dplayx.def,
dpnaddr.def, dpnet.def, dpnlobby.def, dpvoice.def, dsetup.def,
dsound.def, dxerr.c, dxerr8.c, dxerr8w.c, dxerr9.c, dxerr9w.c,
dxguid.c, ksproxy.def, ksuser.c, ksuser.def, msdmo.def, quartz.def,
strmiids.c, test.c): Ditto.
* lib/(d3dim.def, d3drm.def, d3dxof.def, ddraw.def, dinput.c,
dinput.def, dplayx.def, dsetup.def, dsound.def, dxguid.c): Removed.
Diffstat (limited to 'winsup/w32api/lib/Makefile.in')
-rw-r--r-- | winsup/w32api/lib/Makefile.in | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index 377a60bc6..0a7186f6a 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -15,8 +15,8 @@ SHELL = @SHELL@ srcdir = @srcdir@ VPATH = @srcdir@ -SUBDIRS := ddk -subdirs := ddk +SUBDIRS := ddk directx +subdirs := ddk directx host_alias = @host@ build_alias = @build@ @@ -113,21 +113,21 @@ DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def)) MRI_FILES = $(notdir $(wildcard $(srcdir)/*.mri)) IMPLIBS = $(addprefix lib,$(subst .def,.a,$(DEF_FILES))) MIMPLIBS = $(addprefix lib,$(subst .mri,.a,$(MRI_FILES))) -EXTRA_LIBS=libuuid.a libscrnsave.a libscrnsavw.a libdxguid.a liblargeint.a +EXTRA_LIBS=libuuid.a libscrnsave.a libscrnsavw.a liblargeint.a LIBS = $(IMPLIBS) $(MIMPLIBS) $(EXTRA_LIBS) UUID_OBJS = uuid.o mshtml-uuid.o -EXTRA_OBJS = shell32.o dxguid.o scrnsave.o scrnsavw.o largeint.o \ - $(UUID_OBJS) dinput.o kernel32.o +EXTRA_OBJS = shell32.o scrnsave.o scrnsavw.o largeint.o \ + $(UUID_OBJS) kernel32.o UUID_SOURCES = uuid.c mshtml-uuid.c -SOURCES = scrnsave.c shell32.c largeint.c dinput.c $(UUID_SOURCES)\ -dxguid.c res.rc test.c kernel32.c +SOURCES = scrnsave.c shell32.c largeint.c $(UUID_SOURCES)\ +res.rc test.c kernel32.c DISTFILES = Makefile.in $(DEF_FILES) $(MRI_FILES) $(SOURCES) .NOTPARALLEL: # targets -all: $(LIBS) $(EXTRA_OBJS) ddk +all: $(LIBS) $(EXTRA_OBJS) ddk directx %-subdirs: for i in $(SUBDIRS); do \ @@ -137,6 +137,9 @@ all: $(LIBS) $(EXTRA_OBJS) ddk ddk: $(MAKE) $(FLAGS_TO_PASS) -C $@ +directx: + $(MAKE) $(FLAGS_TO_PASS) -C $@ + TEST_OPTIONS = $(ALL_CFLAGS) -DWINVER=0x0666 \ -Wall -pedantic -Wsystem-headers -c $(srcdir)/test.c -o test.o .PHONY: test ddk @@ -191,7 +194,7 @@ lib%.a: %.o .PHONY: install install-libraries install-headers install-ddk # install headers and libraries in a target specified directory. -install: install-libraries install-headers install-ddk +install: install-libraries install-headers install-ddk install-directx install-libraries: all $(mkinstalldirs) $(inst_libdir) @@ -212,8 +215,11 @@ install-headers: install-ddk: install-libraries install-headers cd ddk && $(MAKE) install $(FLAGS_TO_PASS) +install-directx: install-libraries install-headers + cd directx && $(MAKE) install $(FLAGS_TO_PASS) + # uninstall headers and libraries from a target specified directory -uninstall: uninstall-ddk uninstall-libraries uninstall-headers +uninstall: uninstall-ddk uninstall-directx uninstall-libraries uninstall-headers uninstall-libraries: @for i in $(LIBS); do \ @@ -230,6 +236,9 @@ uninstall-headers: uninstall-ddk: cd ddk && $(MAKE) -C uninstall $(FLAGS_TO_PASS) +uninstall-directx: + cd directx && $(MAKE) -C uninstall $(FLAGS_TO_PASS) + dist: mkdir $(distdir)/include chmod 755 $(distdir)/include |