Mercurial > dwindows
changeset 430:636a8a19f6c8
Condifure and Makefile changes for MacOS X.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Tue, 27 May 2003 21:20:12 +0000 |
| parents | f977c80a1dfa |
| children | 561acf6de39a |
| files | Makefile.in configure.in |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Tue May 27 03:41:57 2003 +0000 +++ b/Makefile.in Tue May 27 21:20:12 2003 +0000 @@ -25,7 +25,7 @@ # Link flags shared objects -SYSCONF_LFLAGS_SHOBJ = -shared +SYSCONF_LFLAGS_SHOBJ = $(SHAREDFLAG) # Linking shared libraries # - Build the $(TARGET) library, eg. lib$(TARGET).so.0.0 @@ -34,7 +34,7 @@ # SYSCONF_LINK_SHLIB = gcc SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) -SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ +SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) $(SYSCONF_LFLAGS_SHOBJ) \ -o $(SYSCONF_LINK_TARGET_SHARED) \ $(OBJECTS) $(LFLAGS); \ mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ @@ -44,7 +44,7 @@ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ) SYSCONF_LINK_TARGET_SHARED2 = lib$(TARGET2).so.$(VER_MAJ).$(VER_MIN) -SYSCONF_LINK_LIB_SHARED2 = $(SYSCONF_LINK_SHLIB) -shared \ +SYSCONF_LINK_LIB_SHARED2 = $(SYSCONF_LINK_SHLIB) $(SYSCONF_LFLAGS_SHOBJ) \ -o $(SYSCONF_LINK_TARGET_SHARED2) \ $(OBJECTS2) $(LFLAGS); \ mv $(SYSCONF_LINK_TARGET_SHARED2) $(DESTDIR); \
--- a/configure.in Tue May 27 03:41:57 2003 +0000 +++ b/configure.in Tue May 27 21:20:12 2003 +0000 @@ -7,6 +7,7 @@ DW_SRC=gtk DW_DEFINE=__UNIX__ +SHAREDFLAG=-shared AC_SUBST(DW_MAJOR_VERSION) AC_SUBST(DW_MINOR_VERSION) AC_SUBST(DW_SUB_VERSION) @@ -56,6 +57,8 @@ if test $OPSYSTEM = "Darwin"; then DW_SRC=mac DW_DEFINE=__MAC__ + SHAREDFLAG=-dynamic + LIBS="$LIBS -framework Carbon" else AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) if test x"$PKG_CFG" != x; then @@ -98,6 +101,7 @@ AC_SUBST(CP) AC_SUBST(MV) AC_SUBST(MKDIR) +AC_SUBST(SHAREDFLAG) AC_SUBST(DW_SRC) AC_SUBST(DW_DEFINE)