Changeset 4656 for pjproject/trunk/pjsip-apps/build/Samples.mak

Timestamp:

Nov 23, 2013 7:13:40 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1713: Enable building the libraries as shared libraries/DLLs for GNU targets

File:

• pjproject/trunk/pjsip-apps/build/Samples.mak (modified) (3 diffs)

pjproject/trunk/pjsip-apps/build/Samples.mak

@@ -1 @@
-
+include ../../build.mak
+include ../../version.mak
 include ../../build/common.mak
 
+RULES_MAK := $(PJDIR)/build/rules.mak
 
 ###############################################################################
@@ -17 +19 @@
            aviplay \
            aectest \
-           aviplay \
            clidemo \
            confsample \
@@ -46 +47 @@
            vid_streamutil
 
-EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)$(HOST_EXE))
+EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE))
 
-all: $(BINDIR) $(OBJDIR) $(EXES)
+.PHONY: $(EXES)
 
-$(BINDIR)/%$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(PJ_LIB_FILES)
-        $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \
-            $(subst /,$(HOST_PSEP),$<) \
-            $(_LDFLAGS)
+all: $(EXES)
 
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
-        $(CC) $(_CFLAGS) \
-          $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
-          $(subst /,$(HOST_PSEP),$<) 
-
-$(OBJDIR):
-        $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 
-
-$(BINDIR):
-        $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 
+$(EXES):
+        $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS)" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
 
 depend:
 
 clean:
-        $(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)/*),$(HOST_RMR))
-        $(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)),$(HOST_RMDIR))
+        $(MAKE) -f $(RULES_MAK) APP=SAMPLE app=sample $@
         $(subst @@,$(EXES),$(HOST_RM))
-        rm -rf $(BINDIR)
+        $(subst @@,$(BINDIR),$(HOST_RMDIR))
 
 distclean realclean: clean
-#       $(subst @@,$(subst /,$(HOST_PSEP),$(EXES)) $(subst /,$(HOST_PSEP),$(EXES)),$(HOST_RM))
-#       $(subst @@,$(DEP_FILE),$(HOST_RM))
+        $(MAKE) -f $(RULES_MAK) APP=SAMPLE app=sample $@