headers are now installed by automake too

[wxWidgets.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 269a701759ba4084485b64f55e7ccdedc6001713..f0010d44bfe1196e6368132215a7abd1247af133 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -71,6 +71,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@
 LD = @LD@
 LEX = @LEX@
 LIBTOOL = @LIBTOOL@


@@ -387,7 +388,7 @@ installcheck: installcheck-am
 install-exec-am: install-libLTLIBRARIES
 install-exec: install-exec-am
 
 install-exec-am: install-libLTLIBRARIES
 install-exec: install-exec-am
 

-install-data-am: install-data-local
+install-data-am:

 install-data: install-data-am
 
 install-am: all-am
 install-data: install-data-am
 
 install-am: all-am


@@ -449,8 +450,8 @@ maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir mostlyclean-depend \
 distclean-depend clean-depend maintainer-clean-depend info-am info \
 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
 clean-tags maintainer-clean-tags distdir mostlyclean-depend \
 distclean-depend clean-depend maintainer-clean-depend info-am info \
 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \

-install-exec install-data-local install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \

 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 


@@ -472,51 +473,48 @@ lexer.c: $(srcdir)/common/lexer.l
        sed -e "s/unput/PROIO_unput/g"      > lexer.c
        @$(RM) lex.yy.c
 
        sed -e "s/unput/PROIO_unput/g"      > lexer.c
        @$(RM) lex.yy.c
 

-libwx_@WX_LIBRARY@.la: $(libwx__WX_LIBRARY__la_OBJECTS) $(libwx__WX_LIBRARY__la_DEPENDENCIES)
-       $(CXXLINK) -rpath $(libdir) $(libwx__WX_LIBRARY__la_LDFLAGS) $(libwx__WX_LIBRARY__la_OBJECTS) $(libwx__WX_LIBRARY__la_LIBADD) $(LIBS)
-

 # the files which we install manually (the rest is done by automake)
 # the files which we install manually (the rest is done by automake)

-install-data-local:
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(includedir)/wx
-       $(mkinstalldirs) $(DESTDIR)$(includedir)/wx/generic
-       $(mkinstalldirs) $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@
-       $(mkinstalldirs) $(DESTDIR)$(includedir)/wx/protocol
-       $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/include/wx
-       @for p in $(top_srcdir)/include/wx/*.h $(top_srcdir)/include/wx/*.cpp; do \
-         h=`basename $$p`; (set -x; \
-         $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/$$h ); \
-       done
-       @for p in $(top_srcdir)/include/wx/generic/*.h ; do \
-         h=`basename $$p`; (set -x; \
-         $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/generic/$$h ); \
-       done
-       @for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.h ; do \
-         h=`basename $$p`; (set -x; \
-         $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/$$h ); \
-       done
-       @if [ @TOOLKIT_DIR@ = msw ]; then \
-         for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.cur \
-                  $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.ico \
-                  $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.bmp \
-                  $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.rc ; do \
-           h=`basename $$p`; (set -x; \
-           $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/$$h ); \
-         done; \
-         for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/ctl3d/*.h ; do \
-           h=`basename $$p`; (set -x; \
-           $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/ctl3d/$$h ); \
-         done; \
-         for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/gnuwin32/*.h ; do \
-           h=`basename $$p`; (set -x; \
-           $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/gnuwin32/$$h ); \
-         done; \
-       fi
-       @for p in $(top_srcdir)/include/wx/protocol/*.h ; do \
-         h=`basename $$p`; (set -x; \
-         $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/protocol/$$h ); \
-       done
-       $(INSTALL_DATA) ../include/wx/@TOOLKIT_DIR@/setup.h $(DESTDIR)$(pkgdatadir)/include/wx/setup.h
+#install-data-local:
+#      @$(NORMAL_INSTALL)
+#      $(mkinstalldirs) $(DESTDIR)$(includedir)/wx
+#      $(mkinstalldirs) $(DESTDIR)$(includedir)/wx/generic
+#      $(mkinstalldirs) $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@
+#      $(mkinstalldirs) $(DESTDIR)$(includedir)/wx/protocol
+#      $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/include/wx
+#      @for p in $(top_srcdir)/include/wx/*.h $(top_srcdir)/include/wx/*.cpp; do \
+#        h=`basename $$p`; (set -x; \
+#        $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/$$h ); \
+#      done
+#      @for p in $(top_srcdir)/include/wx/generic/*.h ; do \
+#        h=`basename $$p`; (set -x; \
+#        $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/generic/$$h ); \
+#      done
+#      @for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.h ; do \
+#        h=`basename $$p`; (set -x; \
+#        $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/$$h ); \
+#      done
+#      @if [ @TOOLKIT_DIR@ = msw ]; then \
+#        for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.cur \
+#                 $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.ico \
+#                 $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.bmp \
+#                 $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.rc ; do \
+#          h=`basename $$p`; (set -x; \
+#          $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/$$h ); \
+#        done; \
+#        for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/ctl3d/*.h ; do \
+#          h=`basename $$p`; (set -x; \
+#          $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/ctl3d/$$h ); \
+#        done; \
+#        for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/gnuwin32/*.h ; do \
+#          h=`basename $$p`; (set -x; \
+#          $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/gnuwin32/$$h ); \
+#        done; \
+#      fi
+#      @for p in $(top_srcdir)/include/wx/protocol/*.h ; do \
+#        h=`basename $$p`; (set -x; \
+#        $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/protocol/$$h ); \
+#      done
+#      $(INSTALL_DATA) ../include/wx/@TOOLKIT_DIR@/setup.h $(DESTDIR)$(pkgdatadir)/include/wx/setup.h

 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.