slightly updated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7ee392a2ca
commit
ff684c98ad
@ -1,3 +1,3 @@
|
||||
SUBDIRS = src samples # utils user docs
|
||||
SUBDIRS = include src samples # utils user docs
|
||||
|
||||
pkgdata_SCRIPTS = wx-config
|
||||
|
13
Makefile.in
13
Makefile.in
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
@ -98,7 +99,7 @@ WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
|
||||
WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
|
||||
YACC = @YACC@
|
||||
|
||||
SUBDIRS = src samples # utils user docs
|
||||
SUBDIRS = include src samples # utils user docs
|
||||
|
||||
pkgdata_SCRIPTS = wx-config
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
@ -107,10 +108,10 @@ CONFIG_HEADER = ./${SETUPH_DIR}/setup.h
|
||||
CONFIG_CLEAN_FILES = wx-config
|
||||
SCRIPTS = $(pkgdata_SCRIPTS)
|
||||
|
||||
DIST_COMMON = Makefile.am Makefile.in aclocal.m4 config.guess \
|
||||
config.sub configure configure.in include/wx/unix/setup.h.in \
|
||||
include/wx/unix/stamp-h.in install-sh ltconfig ltmain.sh missing \
|
||||
mkinstalldirs wx-config.in
|
||||
DIST_COMMON = Makefile.am Makefile.in acconfig.h aclocal.m4 \
|
||||
config.guess config.sub configure configure.in \
|
||||
include/wx/unix/setup.h.in include/wx/unix/stamp-h.in install-sh \
|
||||
ltconfig ltmain.sh missing mkinstalldirs wx-config.in
|
||||
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@ -147,7 +148,7 @@ $(srcdir)/include/wx/unix/setup.h.in: $(srcdir)//stamp-h.in
|
||||
rm -f $(srcdir)//stamp-h.in; \
|
||||
$(MAKE) $(srcdir)//stamp-h.in; \
|
||||
else :; fi
|
||||
$(srcdir)//stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
$(srcdir)//stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
|
||||
cd $(top_srcdir) && $(AUTOHEADER)
|
||||
@echo timestamp > $(srcdir)//stamp-h.in 2> /dev/null
|
||||
|
||||
|
23
configure.in
23
configure.in
@ -148,6 +148,8 @@ esac
|
||||
if test "$USE_UNIX" = 1 ; then
|
||||
wxUSE_UNIX=yes
|
||||
AC_DEFINE(__UNIX__)
|
||||
EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/unix"
|
||||
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
|
||||
fi
|
||||
|
||||
dnl Linux: test for libc5/glibc2: glibc2 has gettext() included
|
||||
@ -1144,7 +1146,6 @@ if test "$wxUSE_THREADS" = "yes"; then
|
||||
CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
|
||||
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
|
||||
EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/unix"
|
||||
LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ"
|
||||
|
||||
dnl define autoconf macro to check for given function in both pthread and
|
||||
@ -1421,6 +1422,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_SOCKETS)
|
||||
LTLIBOBJS="$LTLIBOBJS sckint.lo socket.lo sckaddr.lo protocol.lo http.lo ftp.lo url.lo"
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
|
||||
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
|
||||
else
|
||||
AC_MSG_WARN(socket classes require --with-threads and won't be compiled without it)
|
||||
wxUSE_SOCKETS=0
|
||||
@ -1804,9 +1806,10 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl misc options
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
if test "$wxUSE_WXTREE" = "yes"; then
|
||||
AC_DEFINE(wxUSE_WXTREE)
|
||||
fi
|
||||
dnl TODO this is unused for now...
|
||||
dnl if test "$wxUSE_WXTREE" = "yes"; then
|
||||
dnl AC_DEFINE(wxUSE_WXTREE)
|
||||
dnl fi
|
||||
|
||||
if test "$wxUSE_METAFILE" = "yes"; then
|
||||
AC_DEFINE(wxUSE_METAFILE)
|
||||
@ -1916,6 +1919,7 @@ AC_SUBST(EXTRA_VPATH)
|
||||
AC_SUBST(LTLIBOBJS)
|
||||
|
||||
dnl additional subdirectories where we will build
|
||||
AC_SUBST(INCLUDE_SUBDIRS)
|
||||
AC_SUBST(UTILS_SUBDIRS)
|
||||
AC_SUBST(DOCS_SUBDIRS)
|
||||
AC_SUBST(SAMPLES_SUBDIRS)
|
||||
@ -1939,7 +1943,16 @@ dnl create each of the files in the space separated list from the file.in
|
||||
dnl (the original file name may be overriden by appending another name after a
|
||||
dnl colon)
|
||||
AC_OUTPUT([
|
||||
Makefile src/Makefile wx-config
|
||||
wx-config
|
||||
Makefile src/Makefile
|
||||
include/Makefile
|
||||
include/wx/Makefile
|
||||
include/wx/generic/Makefile
|
||||
include/wx/gtk/Makefile
|
||||
include/wx/motif/Makefile
|
||||
include/wx/msw/Makefile
|
||||
include/wx/protocol/Makefile
|
||||
include/wx/unix/Makefile
|
||||
samples/Makefile
|
||||
samples/bombs/Makefile
|
||||
samples/caret/Makefile
|
||||
|
@ -7,3 +7,9 @@
|
||||
|
||||
SUBDIRS = minimal \
|
||||
@SAMPLES_SUBDIRS@
|
||||
|
||||
# do nothing during "make install" in the samples subdirectory (can't override
|
||||
# install because install-recursive is its dependency which is still built)
|
||||
install-recursive:
|
||||
@true
|
||||
|
||||
|
@ -79,6 +79,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
@ -316,6 +317,11 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
|
||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||
|
||||
|
||||
# do nothing during "make install" in the samples subdirectory (can't override
|
||||
# install because install-recursive is its dependency which is still built)
|
||||
install-recursive:
|
||||
@true
|
||||
|
||||
# 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.
|
||||
.NOEXPORT:
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
|
||||
GTK_CFLAGS = @GTK_CFLAGS@
|
||||
GTK_CONFIG = @GTK_CONFIG@
|
||||
GTK_LIBS = @GTK_LIBS@
|
||||
INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@
|
||||
LD = @LD@
|
||||
LEX = @LEX@
|
||||
LIBS = @LIBS@
|
||||
|
@ -473,49 +473,6 @@ lexer.c: $(srcdir)/common/lexer.l
|
||||
sed -e "s/unput/PROIO_unput/g" > lexer.c
|
||||
@$(RM) lex.yy.c
|
||||
|
||||
# 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
|
||||
|
||||
# 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.
|
||||
.NOEXPORT:
|
||||
|
Loading…
Reference in New Issue
Block a user