summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2007-07-09 19:35:33 (GMT)
committerhobbs <hobbs>2007-07-09 19:35:33 (GMT)
commit047b5d11781b17e9eb24ed03b4e5c1cd4c92ccbc (patch)
tree055968373a387915720153b274a3fab466dcaf1c
parenta5f405cd8430eed957da22358c7830158eb0dd89 (diff)
downloadtk-047b5d11781b17e9eb24ed03b4e5c1cd4c92ccbc.zip
tk-047b5d11781b17e9eb24ed03b4e5c1cd4c92ccbc.tar.gz
tk-047b5d11781b17e9eb24ed03b4e5c1cd4c92ccbc.tar.bz2
* unix/Makefile.in: clarify what the headers installed are, and
add ttkTheme.h and ttkDecls.h to private headers (later public).
-rw-r--r--ChangeLog5
-rw-r--r--unix/Makefile.in22
2 files changed, 18 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 3dea016..3a1a0e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-09 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * unix/Makefile.in: clarify what the headers installed are, and
+ add ttkTheme.h and ttkDecls.h to private headers (later public).
+
2007-07-09 Daniel Steffen <das@users.sourceforge.net>
* macosx/tkMacOSXWindowEvent.c (Tk_MacOSXIsAppInFront): use process mgr
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6d50f32..5230092 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.130 2007/06/03 13:43:34 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.131 2007/07/09 19:35:34 hobbs Exp $
# Current Tk version; used in various names.
@@ -540,9 +540,16 @@ AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h
X11_PRIVATE_HDRS = $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h
-HDRS = bltList.h \
- default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \
- tkPort.h tkScrollbar.h tkText.h
+# Currently private, eventually public
+TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h
+
+PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
+ $(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS)
+
+# The private headers we want installed for install-private-headers
+PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
+ $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
+ $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS)
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
@@ -742,8 +749,7 @@ install-libraries: libraries
chmod +x $(SRC_DIR)/install-sh; \
fi
@echo "Installing header files";
- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
- $(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS) ; \
+ @for i in $(PUBLIC_HDRS); \
do \
$(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
done;
@@ -854,9 +860,7 @@ install-private-headers: libraries
chmod +x $(SRC_DIR)/install-sh; \
fi
@echo "Installing private header files";
- @for i in $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
- $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
- $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS); \
+ @for i in $(PRIVATE_HDRS); \
do \
$(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \
done;