From: Earnie Boyd <earnie@users.sourceforge.net>
Date: Mon, 29 Jul 2013 01:54:19 +0000 (-0400)
Subject: Correction for issue #2007.
X-Git-Tag: 4.0.0~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b95d3b266051084843c1ae03878c1de1d3bc6c1b;hp=e1b06ae715fd7eefa1cf4465c89c4fb660b44bff;p=mingw%2Fmingw-org-wsl.git

Correction for issue #2007.
---

diff --git a/ChangeLog b/ChangeLog
index 0e4caac..0e00230 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-07-28  Earnie Boyd  <earnie@users.sourceforge.net>
+
+	Correction for issue #2007.
+
+	* Makefile.in: Corrected for missing libgmon.a objects and headers.
+	* misc/gpl/profile/profil.h: Move to ...
+	* misc/gpl/include/profil.h: Here.
+	* misc/src/libcrt/profile/gmon.h: Move to ...
+	* misc/src/include/gmon.h: Here.
+
 2013-06-28  Earnie Boyd  <earnie@users.sourceforge.net>
 
 	* include/tchar.h (_tcsclen): Add missing define.
diff --git a/Makefile.in b/Makefile.in
index 0314737..377cfd2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,6 +58,7 @@ MKDIR_P = @MKDIR_P@
 
 INCLUDES=-I$(top_srcdir)/include -I$(srcdir)/include \
   -I$(top_srcdir)/src/libcrt/include -I$(top_srcdir)/misc/src/include \
+  -I$(top_srcdir)/misc/include -I$(top_srcdir)/misc/gpl/include \
   -nostdinc -iwithprefixbefore include
 ALL_CFLAGS=$(CFLAGS) $(INCLUDES) -DNTDDI_VERSION=0x04000000
 
@@ -527,7 +528,7 @@ SRCDIR := misc/src/libcrt/profile
 profile_SOURCES := \
   $(SRCDIR)/gmon.c \
   $(SRCDIR)/mcount.c \
-  misc/gpl/profile/profil.c \
+  misc/gpl/profile/profil.c 
 libgmon_a_SOURCES := $(profile_SOURCES)
 libgmon_a_OBJECTS := $(libgmon_a_SOURCES:.c=.o)
 
@@ -948,12 +949,24 @@ install-includes:
 	for INC in $(top_srcdir)/include/*.h; do \
 	  $(INSTALL_DATA) $$INC $(DESTDIR)$(includedir) ; \
 	done
+	for INC in $(top_srcdir)/misc/include/*.h; do \
+	  $(INSTALL_DATA) $$INC $(DESTDIR)$(includedir) ; \
+	done
+	for INC in $(top_srcdir)/misc/gpl/include/*.h; do \
+	  $(INSTALL_DATA) $$INC $(DESTDIR)$(includedir) ; \
+	done
 	for I in `find $(top_srcdir)/include/* -type d`; do \
 	  J=`basename $$I`; \
 	  for INC in $$I/*.h; do \
 	    $(INSTALL_DATA) $$INC $(DESTDIR)$(includedir)/$$J ; \
 	  done \
 	done
+	for I in `find $(top_srcdir)/misc/include/* -type d`; do \
+	  J=`basename $$I`; \
+	  for INC in $$I/*.h; do \
+	    $(INSTALL_DATA) $$INC $(DESTDIR)$(includedir)/$$J ; \
+	  done \
+	done
 
 install-bins: all
 	for BIN in $(bin_LIBRARIES); do \
@@ -991,6 +1004,9 @@ mingwrt_lib_SYS_INCLUDES := \
   fcntl.h  locking.h  stat.h  timeb.h  unistd.h \
   file.h   param.h    time.h  types.h  utime.h
 
+mingwrt_lib_MISC_INCLUDES := \
+  misc/include/profile.h \
+  misc/gpl/include/profil.h
 
 install-mingwrt: install-mingwrt-dirs
 	for BIN in $(mingwrt_bin_LIBRARIES); do \
@@ -1002,6 +1018,9 @@ install-mingwrt: install-mingwrt-dirs
 	for INC in $(addprefix $(top_srcdir)/include/sys/,$(mingwrt_lib_SYS_INCLUDES)); do \
 	  $(INSTALL_DATA) $$INC $(DESTDIR)$(includedir)/sys/ ; \
 	done
+	for INC in $(addprefix $(top_srcdir)/,$(mingwrt_lib_MISC_INCLUDES)); do \
+	  $(INSTALL_DATA) $$INC $(DESTDIR)$(includedir)/ ; \
+	done
 	for LIB in $(mingwrt_lib_LIBRARIES); do \
 	  $(INSTALL_DATA) $$LIB $(DESTDIR)$(libdir)/ ; \
 	done
diff --git a/misc/gpl/profile/profil.h b/misc/gpl/include/profil.h
similarity index 100%
rename from misc/gpl/profile/profil.h
rename to misc/gpl/include/profil.h
diff --git a/misc/src/libcrt/profile/gmon.h b/misc/src/include/gmon.h
similarity index 100%
rename from misc/src/libcrt/profile/gmon.h
rename to misc/src/include/gmon.h