Created include/Makefile.in to separate header file installation from
the top-level Makefile.
diff --git a/Makefile.in b/Makefile.in
index 117b17e..ec0fc79 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,8 +80,10 @@
DOCSUBDIRS = documentation
-# All sub-directories
-ALLSUBDIRS = \
+INCSUBDIRS = include
+
+# Sub-directories to run make into
+BUILDSUBDIRS = \
$(LIBSUBDIRS) \
$(X11SUBDIRS) \
$(EMUSUBDIRS) \
@@ -92,7 +94,7 @@
DEPENDSUBDIRS = $(LIBSUBDIRS) $(X11SUBDIRS) $(EMUSUBDIRS) $(DOCSUBDIRS)
# Sub-directories to run make install into
-INSTALLSUBDIRS = $(DOCSUBDIRS)
+INSTALLSUBDIRS = $(DOCSUBDIRS) $(INCSUBDIRS)
LIBOBJS = \
controls/controls.o \
@@ -186,28 +188,16 @@
uninstall_emu: uninstall_lib
$(RM) $(bindir)/wine $(bindir)/dosmod
-install_lib: install_includes
+install_lib: dummy
[ -d $(libdir) ] || $(MKDIR) $(libdir)
if [ $(LIB_TARGET) ]; then $(INSTALL_DATA) $(LIB_TARGET) $(libdir); fi
$(INSTALL_DATA) wine.sym $(libdir)/wine.sym
-uninstall_lib: uninstall_includes
+uninstall_lib: dummy
cd $(libdir); $(RM) $(LIB_TARGET)
$(RM) $(libdir)/wine.sym
-install_includes: dummy
-# Testing LIB_TARGET prevents installing header files
-# when --disable-lib is used.
- if [ $(LIB_TARGET) ]; then [ -d $(includedir) ] || $(MKDIR) $(includedir); \
- cd $(TOPSRCDIR)/include; $(INSTALL_DATA) windows.h wintypes.h $(includedir); fi
-
-# Don't just do a rm -rf on $(includedir) -- don't want to wipe out
-# anything extra the user may have put there.
-uninstall_includes: dummy
- $(RM) $(includedir)/windows.h $(includedir)/wintypes.h
- -rmdir $(includedir)
-
-$(ALLSUBDIRS): dummy
+$(BUILDSUBDIRS): dummy
@cd $@; $(SUBMAKE)
install_programs: dummy
@@ -237,7 +227,7 @@
for i in $(LIBSUBDIRS); do (cd $$i && $(MAKE) html); done
clean::
- for i in $(ALLSUBDIRS); do (cd $$i; $(MAKE) clean) || exit 1; done
+ for i in $(BUILDSUBDIRS); do (cd $$i; $(MAKE) clean) || exit 1; done
for i in include; do (cd $$i; $(RM) *.o \#*\# .#* *~ *% *.bak *.orig *.rej *.flc); done
$(RM) wine wine.sym libwine.a libwine.so.1.0 libwine.so TAGS .#*
diff --git a/configure b/configure
index ad343f7..c555732 100755
--- a/configure
+++ b/configure
@@ -4495,6 +4495,7 @@
graphics/win16drv/Makefile
graphics/x11drv/Makefile
if1632/Makefile
+include/Makefile
ipc/Makefile
library/Makefile
libtest/Makefile
@@ -4654,6 +4655,7 @@
graphics/win16drv/Makefile
graphics/x11drv/Makefile
if1632/Makefile
+include/Makefile
ipc/Makefile
library/Makefile
libtest/Makefile
diff --git a/configure.in b/configure.in
index b54f898..3705dc7 100644
--- a/configure.in
+++ b/configure.in
@@ -622,6 +622,7 @@
graphics/win16drv/Makefile
graphics/x11drv/Makefile
if1632/Makefile
+include/Makefile
ipc/Makefile
library/Makefile
libtest/Makefile
diff --git a/include/.cvsignore b/include/.cvsignore
index 0e56cf2..547646a 100644
--- a/include/.cvsignore
+++ b/include/.cvsignore
@@ -1 +1,2 @@
+Makefile
config.h
diff --git a/include/Makefile.in b/include/Makefile.in
new file mode 100644
index 0000000..a263fc3
--- /dev/null
+++ b/include/Makefile.in
@@ -0,0 +1,31 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = none
+
+LIB_TARGET = @LIB_TARGET@
+
+INSTALLED_INCLUDES = \
+ windows.h \
+ wingdi.h \
+ wintypes.h \
+ winuser.h
+
+@MAKE_RULES@
+
+# Testing LIB_TARGET prevents installing header files
+# when --disable-lib is used
+install:: dummy
+ if [ $(LIB_TARGET) ]; then [ -d $(includedir) ] || $(MKDIR) $(includedir); \
+ $(INSTALL_DATA) $(INSTALLED_INCLUDES) $(includedir); fi
+
+# Don't just do a rm -rf on $(includedir) -- don't want to wipe out
+# anything extra the user may have put there.
+uninstall::
+ cd $(includedir); $(RM) $(INSTALLED_INCLUDES)
+ -rmdir $(includedir)
+
+dummy:
+
+### Dependencies:
