1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

Improve creation of shared libraries for FreeBSD

This commit is contained in:
Marcin Cieslak 2012-08-13 04:01:45 +02:00 committed by Jon Trulson
parent 851330b5f5
commit e1aa4d28cb
2 changed files with 9 additions and 4 deletions

View file

@ -4,7 +4,7 @@ XCOMM platform: $TOG: FreeBSD.cf /main/21 1997/10/05 20:42:34 kaleb $
#define OSName DefaultOSName #define OSName DefaultOSName
#endif #endif
#ifndef OSVendor #ifndef OSVendor
#define OSVendor Walnut Creek CD-ROM #define OSVendor FreeBSD Foundation
#endif #endif
#ifndef OSMajorVersion #ifndef OSMajorVersion
#define OSMajorVersion DefaultOSMajorVersion #define OSMajorVersion DefaultOSMajorVersion
@ -57,6 +57,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define DefaultCCOptions -pipe #define DefaultCCOptions -pipe
#endif #endif
#define CplusplusLibC -lstdc++
#if OSMajorVersion > 1 #if OSMajorVersion > 1
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
#define XawI18nDefines -DUSE_XWCHAR_STRING #define XawI18nDefines -DUSE_XWCHAR_STRING

View file

@ -33,8 +33,8 @@ XCOMM $XConsortium: bsdLib.rules /main/3 1996/09/28 16:09:18 rws $
#define InstallSharedLibrary(libname,rev,dest) @@\ #define InstallSharedLibrary(libname,rev,dest) @@\
install:: Concat(lib,libname.so.rev) @@\ install:: Concat(lib,libname.so.rev) @@\
MakeDir($(DESTDIR)dest) @@\ MakeDir($(DESTDIR)dest) @@\
$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
@@\ $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
#endif /* InstallSharedLibrary */ #endif /* InstallSharedLibrary */
@ -52,10 +52,13 @@ Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\ (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
$(RM) $@ @@\ $(RM) $@ @@\
$(MV) $@~ $@ @@\ $(MV) $@~ $@ @@\
$(RM) Concat(lib,libname.so) @@\
$(LN) $@ Concat(lib,libname.so) @@\
LinkBuildLibrary($@) @@\ LinkBuildLibrary($@) @@\
LinkBuildLibrary(Concat(lib,libname.so)) @@\
@@\ @@\
clean:: @@\ clean:: @@\
$(RM) Concat(lib,libname.so.rev) $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
#endif /* SharedLibraryTarget */ #endif /* SharedLibraryTarget */