fixed a design flaw in wxFontMapper that prevented automatic creation of wxConfig...

[wxWidgets.git] / src / makelib.env.in

diff --git a/src/makelib.env.in b/src/makelib.env.in
index 7b6d8b18966f6938154497c7517ba91122b2c881..24d821b09c6dfa72065d835b9eb27fa72e9ec03d 100644 (file)
--- a/src/makelib.env.in
+++ b/src/makelib.env.in
@@ -3,13 +3,23 @@
 #
 # Author:   Ron Lee <ron@debian.org>
 # Created:  19/3/2000
 #
 # Author:   Ron Lee <ron@debian.org>
 # Created:  19/3/2000

+# $Id$

 #
 #

-# To use, set the following vars before including it.
+# To use, set the following vars before including it:
+#
+# top_srcdir
+# top_builddir
+# libsrc_dir

 #
 # TARGET_LIBNAME
 # LIBVERSION_CURRENT
 # LIBVERSION_REVISION
 # LIBVERSION_AGE
 #
 # TARGET_LIBNAME
 # LIBVERSION_CURRENT
 # LIBVERSION_REVISION
 # LIBVERSION_AGE

+# HEADER_PATH
+# HEADER_SUBDIR
+#
+# HEADERS
+# OBJECTS

 #
 # either a shared or static lib will be built according to the
 # option given to configure.
 #
 # either a shared or static lib will be built according to the
 # option given to configure.


@@ -17,15 +27,19 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@

+includedir = @includedir@

 libdir = @libdir@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 libdir = @libdir@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

+INSTALL_DATA = @INSTALL_DATA@

 
 

-TARGETLIB_STATIC=$(TARGET_LIBNAME).a
-TARGETLIB_SHARED=$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
-TARGETLIB_LINK1=$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
-TARGETLIB_LINK2=$(TARGET_LIBNAME).so
+TARGETLIB_STATIC = $(TARGET_LIBNAME).a
+TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
+TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
+TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
+
+TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@

 
 # Clears all default suffixes
 .SUFFIXES:     .o .cpp .c .cxx
 
 # Clears all default suffixes
 .SUFFIXES:     .o .cpp .c .cxx


@@ -39,10 +53,15 @@ TARGETLIB_LINK2=$(TARGET_LIBNAME).so
 .cxx.o :
        $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
 
 .cxx.o :
        $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
 

+# the comment at the end of the next line is needed because otherwise autoconf
+# would remove this line completely - it contains a built-in hack to remove
+# any VPATH assignment not containing ':'
+VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc_dir) # ':' for autoconf
+

 include $(top_builddir)/src/make.env
 
 
 include $(top_builddir)/src/make.env
 
 

-all:    libtype_@WX_TARGET_LIBRARY_TYPE@
+all: libtype_@WX_TARGET_LIBRARY_TYPE@

 
 libtype_so: CREATE_LINKS
 
 
 libtype_so: CREATE_LINKS
 


@@ -50,38 +69,58 @@ libtype_a: $(TARGETLIB_STATIC)
 
 
 $(TARGETLIB_SHARED): $(OBJECTS)
 
 
 $(TARGETLIB_SHARED): $(OBJECTS)

-       $(SHARED_LD) $@ $(OBJECTS)
+       @$(INSTALL) -d $(top_builddir)/lib
+       $(SHARED_LD) $(top_builddir)/lib/$@ $(TARGETLIB_SONAME) $(OBJECTS)

 
 CREATE_LINKS: $(TARGETLIB_SHARED)
 
 CREATE_LINKS: $(TARGETLIB_SHARED)

-       @$(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2)
-       $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1)
-       $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
+       cd $(top_builddir)/lib \
+               && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
+               && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
+               && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)

 
 $(TARGETLIB_STATIC): $(OBJECTS)
 
 $(TARGETLIB_STATIC): $(OBJECTS)

-       ar $(AROPTIONS) $@ $(OBJECTS)
-       $(RANLIB) $@
+       @$(INSTALL) -d $(top_builddir)/lib
+       ar $(AROPTIONS) $(top_builddir)/lib/$@ $(OBJECTS)
+       $(RANLIB) $(top_builddir)/lib/$@

 
 

-install: install_@WX_TARGET_LIBRARY_TYPE@
+install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers

 
 install_so:
 
 install_so:

-       $(INSTALL_PROGRAM) $(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)
+       $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)

        @$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2)
        cd $(libdir) \
                && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
                && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
 
 install_a:
        @$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2)
        cd $(libdir) \
                && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
                && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
 
 install_a:

-       $(INSTALL_PROGRAM) $(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC)
+       $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC)
+
+install_headers:
+       $(INSTALL) -d $(includedir)/wx/$(HEADER_SUBDIR)
+       @for h in $(HEADERS); do \
+         $(INSTALL_DATA) $(HEADER_PATH)/$(HEADER_SUBDIR)/$$h $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
+         echo "installing $(includedir)/wx/$(HEADER_SUBDIR)/$$h"; \
+       done

 
 uninstall:
        $(RM) $(libdir)/$(TARGETLIB_STATIC)
        $(RM) $(libdir)/$(TARGETLIB_SHARED)
        $(RM) $(libdir)/$(TARGETLIB_LINK1)
        $(RM) $(libdir)/$(TARGETLIB_LINK2)
 
 uninstall:
        $(RM) $(libdir)/$(TARGETLIB_STATIC)
        $(RM) $(libdir)/$(TARGETLIB_SHARED)
        $(RM) $(libdir)/$(TARGETLIB_LINK1)
        $(RM) $(libdir)/$(TARGETLIB_LINK2)

+       @echo "removing headers"
+       @for h in $(HEADERS); do \
+         $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
+       done
+       @if test -d $(includedir)/wx/$(HEADER_SUBDIR); then \
+         rmdir $(includedir)/wx/$(HEADER_SUBDIR); \
+       fi
+       @-rmdir $(includedir)/wx

 
 clean:
 
 clean:

-       $(RM) $(OBJECTS) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
-             $(TARGETLIB_LINK2) $(TARGETLIB_STATIC) core
+       $(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \
+             $(top_builddir)/lib/$(TARGETLIB_LINK1) \
+             $(top_builddir)/lib/$(TARGETLIB_LINK2) \
+             $(top_builddir)/lib/$(TARGETLIB_STATIC) core

 
 .PHONY: all shared static clean install install_static install_shared uninstall
 
 
 .PHONY: all shared static clean install install_static install_shared uninstall