aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/flext/buildsys/lnx
diff options
context:
space:
mode:
Diffstat (limited to 'externals/grill/flext/buildsys/lnx')
-rw-r--r--externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc8
-rw-r--r--externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc16
-rw-r--r--externals/grill/flext/buildsys/lnx/gnumake-gcc.inc9
-rw-r--r--externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc8
-rw-r--r--externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc14
-rw-r--r--externals/grill/flext/buildsys/lnx/gnumake-icc.inc9
6 files changed, 39 insertions, 25 deletions
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc
index 5a26af4c..09d77eb7 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc
@@ -1,8 +1,16 @@
# build class specific settings
+TARGET=$(TARGETPATH)/$(TARGETNAME)
+INSTTARGET=$(TARGET)
+
INCPATH += -I$(FLEXTINC)
LIBPATH += -L$(FLEXTLIB)
+
+#ifdef SHARED
+#LIBS += -l$(FLEXTNAME).$(FLEXTMAJOR).$(FLEXTMINOR)
+#else
LIBS += -l$(FLEXTNAME)
+#endif
##############################################
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc
index 2689e922..33af6a1c 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc
@@ -1,5 +1,14 @@
# build class specific settings
+CMPNAME=$(OUTNAME).$(EXT).$(FLEXTMAJOR).$(FLEXTMINOR)
+VERNAME=$(CMPNAME).$(FLEXTMICRO)
+TARGET=$(TARGETPATH)/$(VERNAME)
+INSTTARGET=$(TARGET)
+
+ifdef SHARED
+LDFLAGS += -Wl,-soname,$(CMPNAME)
+endif
+
##############################################
# default target
@@ -21,7 +30,7 @@ $(TARGET) :: $(TARGETPATH)
$(TARGET) :: $(COBJS) $(CPPOBJS)
ifdef SHARED
- $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ -Wl,-soname,$(TARGETNAME) $(COBJS) $(CPPOBJS) $(LIBS)
+ $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
chmod 755 $@
ifndef DEBUG
ifndef PROFILE
@@ -44,12 +53,11 @@ $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN):
_install_: $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN)
install $(TARGET) $(FLEXTLIB)
-ifdef VERNAME
ifdef SHARED
/sbin/ldconfig -l $(FLEXTLIB)/$(VERNAME)
+ -ln -sf $(CMPNAME) $(FLEXTLIB)/$(OUTNAME).$(EXT)
else
- -ln -sf $(FLEXTLIB)/$(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
-endif
+ -ln -sf $(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
endif
install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
# transfer build system
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
index 6ff417aa..92b71ccf 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
@@ -11,15 +11,6 @@ OBJPATH=$(OUTPATH)/$(OUTSUB)
TARGETPATH=$(OBJPATH)
TARGETNAME=$(OUTNAME).$(EXT)
-ifdef PKGVERSION
-VERNAME=$(OUTNAME).$(PKGVERSION).$(EXT)
-TARGET=$(TARGETPATH)/$(VERNAME)
-else
-TARGET=$(TARGETPATH)/$(TARGETNAME)
-endif
-
-INSTTARGET=$(TARGET)
-
##############################################
CFLAGS += -pthread -fPIC
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc
index d19d5966..e60789ec 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc
@@ -1,8 +1,16 @@
# build class specific settings
+TARGET=$(TARGETPATH)/$(TARGETNAME)
+INSTTARGET=$(TARGET)
+
INCPATH += -I$(FLEXTINC)
LIBPATH += -L$(FLEXTLIB)
+
+ifdef SHARED
+LIBS += -l$(FLEXTNAME).$(FLEXTMAJOR).$(FLEXTMINOR)
+else
LIBS += -l$(FLEXTNAME)
+endif
##############################################
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc
index 1668f609..03d0191e 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc
@@ -1,5 +1,14 @@
# build class specific settings
+CMPNAME=$(OUTNAME).$(EXT).$(FLEXTMAJOR).$(FLEXTMINOR)
+VERNAME=$(CMPNAME).$(FLEXTMICRO)
+TARGET=$(TARGETPATH)/$(VERNAME)
+INSTTARGET=$(TARGET)
+
+ifdef SHARED
+LDFLAGS += -Wl,-soname,$(CMPNAME)
+endif
+
##############################################
# default target
@@ -44,12 +53,11 @@ $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN):
_install_: $(FLEXTINC) $(FLEXTLIB) $(FLEXTSYS) $(FLEXTBIN)
install $(TARGET) $(FLEXTLIB)
-ifdef VERNAME
ifdef SHARED
/sbin/ldconfig -l $(FLEXTLIB)/$(VERNAME)
+ -ln -sf $(CMPNAME) $(FLEXTLIB)/$(OUTNAME).$(EXT)
else
- -ln -sf $(FLEXTLIB)/$(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
-endif
+ -ln -sf $(VERNAME) $(FLEXTLIB)/$(TARGETNAME)
endif
install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
# transfer build system
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc
index d624dc79..be58fc13 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc
@@ -11,15 +11,6 @@ OBJPATH=$(OUTPATH)/$(OUTSUB)
TARGETPATH=$(OBJPATH)
TARGETNAME=$(OUTNAME).$(EXT)
-ifdef PKGVERSION
-VERNAME=$(OUTNAME).$(PKGVERSION).$(EXT)
-TARGET=$(TARGETPATH)/$(VERNAME)
-else
-TARGET=$(TARGETPATH)/$(TARGETNAME)
-endif
-
-INSTTARGET=$(TARGET)
-
##############################################
CFLAGS +=