Skip to content

C
core
Kaydet (Commit) 099d24da authored tarafından Patrick Luby's avatar Patrick Luby
Dosyalara gözat
Seçenekler

Updates to synchronize Mac OS X build with updates to init-static-template-data script

üst e51c0103
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 139 deletions
solenv/inc/_tg_app.mk
Dosyayı görüntüle @ 099d24da
......@@ -33,21 +33,17 @@ USE_APP1DEF=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP1STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(APP1TARGETN)"!=""
$(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
$(APP1RES) \
$(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
@echo ------------------------------
@echo Making: $@
......@@ -198,21 +194,17 @@ USE_APP2DEF=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP2STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(APP2TARGETN)"!=""
$(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
$(APP2RES) \
$(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
@echo ------------------------------
@echo Making: $@
......@@ -363,21 +355,17 @@ USE_APP3DEF=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP3STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(APP3TARGETN)"!=""
$(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
$(APP3RES) \
$(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
@echo ------------------------------
@echo Making: $@
......@@ -528,21 +516,17 @@ USE_APP4DEF=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP4STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(APP4TARGETN)"!=""
$(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
$(APP4RES) \
$(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
@echo ------------------------------
@echo Making: $@
......@@ -693,21 +677,17 @@ USE_APP5DEF=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP5STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(APP5TARGETN)"!=""
$(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
$(APP5RES) \
$(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
@echo ------------------------------
@echo Making: $@
......@@ -858,21 +838,17 @@ USE_APP6DEF=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP6STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(APP6TARGETN)"!=""
$(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
$(APP6RES) \
$(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
@echo ------------------------------
@echo Making: $@
......@@ -1023,21 +999,17 @@ USE_APP7DEF=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP7STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(APP7TARGETN)"!=""
$(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
$(APP7RES) \
$(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
@echo ------------------------------
@echo Making: $@
......@@ -1188,21 +1160,17 @@ USE_APP8DEF=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP8STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(APP8TARGETN)"!=""
$(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
$(APP8RES) \
$(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
@echo ------------------------------
@echo Making: $@
......@@ -1353,21 +1321,17 @@ USE_APP9DEF=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP9STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(APP9TARGETN)"!=""
$(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
$(APP9RES) \
$(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
@echo ------------------------------
@echo Making: $@
......@@ -1518,21 +1482,17 @@ USE_APP10DEF=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP10STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(APP10TARGETN)"!=""
$(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
$(APP10RES) \
$(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
@echo ------------------------------
@echo Making: $@
......
solenv/inc/_tg_shl.mk
Dosyayı görüntüle @ 099d24da
......@@ -6,10 +6,8 @@ SHL1STDLIBS=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL1STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != ""
SHL1STDLIBS=
......@@ -322,11 +320,9 @@ $(SHL1TARGETN) : \
.ENDIF
.IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......@@ -378,10 +374,8 @@ SHL2STDLIBS=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL2STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != ""
SHL2STDLIBS=
......@@ -694,11 +688,9 @@ $(SHL2TARGETN) : \
.ENDIF
.IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......@@ -750,10 +742,8 @@ SHL3STDLIBS=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL3STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != ""
SHL3STDLIBS=
......@@ -1066,11 +1056,9 @@ $(SHL3TARGETN) : \
.ENDIF
.IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......@@ -1122,10 +1110,8 @@ SHL4STDLIBS=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL4STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != ""
SHL4STDLIBS=
......@@ -1438,11 +1424,9 @@ $(SHL4TARGETN) : \
.ENDIF
.IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......@@ -1494,10 +1478,8 @@ SHL5STDLIBS=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL5STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != ""
SHL5STDLIBS=
......@@ -1810,11 +1792,9 @@ $(SHL5TARGETN) : \
.ENDIF
.IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......@@ -1866,10 +1846,8 @@ SHL6STDLIBS=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL6STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != ""
SHL6STDLIBS=
......@@ -2182,11 +2160,9 @@ $(SHL6TARGETN) : \
.ENDIF
.IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......@@ -2238,10 +2214,8 @@ SHL7STDLIBS=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL7STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != ""
SHL7STDLIBS=
......@@ -2554,11 +2528,9 @@ $(SHL7TARGETN) : \
.ENDIF
.IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......@@ -2610,10 +2582,8 @@ SHL8STDLIBS=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL8STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != ""
SHL8STDLIBS=
......@@ -2926,11 +2896,9 @@ $(SHL8TARGETN) : \
.ENDIF
.IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......@@ -2982,10 +2950,8 @@ SHL9STDLIBS=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL9STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != ""
SHL9STDLIBS=
......@@ -3298,11 +3264,9 @@ $(SHL9TARGETN) : \
.ENDIF
.IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......@@ -3354,10 +3318,8 @@ SHL10STDLIBS=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL10STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != ""
SHL10STDLIBS=
......@@ -3670,11 +3632,9 @@ $(SHL10TARGETN) : \
.ENDIF
.IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......
solenv/inc/tg_app.mk
Dosyayı görüntüle @ 099d24da
......@@ -3,8 +3,8 @@
#* $Workfile: tg_app.mk $
#*
#* Ersterstellung XX TT.MM.JJ
#* Letzte Aenderung $Author: pluby $ $Date: 2001-02-26 07:51:45 $
#* $Revision: 1.12 $
#* Letzte Aenderung $Author: pluby $ $Date: 2001-02-26 21:51:20 $
#* $Revision: 1.13 $
#*
#* $Logfile: T:/solar/inc/tg_app.mkv $
#*
......@@ -79,21 +79,17 @@ USE_APP$(TNR)DEF=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
APP$(TNR)STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(APP$(TNR)TARGETN)"!=""
$(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
$(APP$(TNR)RES) \
$(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
.IF "$(OS)"=="MACOSX"
.IF "$(PRJNAME)"!="xml2cmp"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
@echo ------------------------------
@echo Making: $@
......
solenv/inc/tg_shl.mk
Dosyayı görüntüle @ 099d24da
......@@ -2,9 +2,9 @@
#
# $RCSfile: tg_shl.mk,v $
#
# $Revision: 1.21 $
# $Revision: 1.22 $
#
# last change: $Author: pluby $ $Date: 2001-02-26 07:51:45 $
# last change: $Author: pluby $ $Date: 2001-02-26 21:51:20 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
......@@ -106,10 +106,8 @@ SHL$(TNR)STDLIBS=
# Link in static data members for template classes
.IF "$(OS)"=="MACOSX"
.IF "$(TARGET)"!="$(STATICLIBNAME)"
SHL$(TNR)STDLIBS+=$(STATICLIB)
.ENDIF
.ENDIF
.IF "$(SHLLINKARCONLY)" != ""
SHL$(TNR)STDLIBS=
......@@ -422,11 +420,9 @@ $(SHL$(TNR)TARGETN) : \
.ENDIF
.IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.IF "$(TARGET)"!="$(STATICLIBNAME)"
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)"
.ENDIF
@echo "------------------------------"
@echo "Updating static data member initializations"
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
.ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
......
solenv/inc/unxmacxp.mk
Dosyayı görüntüle @ 099d24da
......@@ -2,9 +2,9 @@
#
# $RCSfile: unxmacxp.mk,v $
#
# $Revision: 1.23 $
# $Revision: 1.24 $
#
# last change: $Author: pluby $ $Date: 2001-02-25 19:51:13 $
# last change: $Author: pluby $ $Date: 2001-02-26 21:51:20 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
......@@ -131,7 +131,7 @@ SOLARVERSHLLIBS+=$(shell -ls $(STLPORT4)$/lib$/*$(DLLPOST))
LINK=cc
LINKFLAGS=-dynamic -framework System -framework Cocoa -lcc_dynamic -lstdc++ \
$(foreach,i,$(SOLARVERSHLLIBS) '-dylib_file @executable_path$/$(i:f):$i')
$(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i)
LINKFLAGSAPPGUI=-Wl,-u,__objcInit
LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)' \
-Wl,-U,___progname -Wl,-U,_environ
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment