Mercurial Mercurial > sustaining > oi_151a > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/ekiga-02-pwlib-name.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 7074 f6139a459609
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7074
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
     1
 
--- pwlib/make/unix.mak.ori	2006-03-21 14:06:23.916249000 +0800
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
     2
 
+++ pwlib/make/unix.mak	2006-03-21 14:06:29.476334000 +0800
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
     3
 
@@ -939,7 +939,11 @@
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
     4
 
 PW_LIBDIR	= $(PWLIBDIR)/lib
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
     5
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
     6
 
 # set name of the PT library
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
     7
 
+ifeq ($(OSTYPE),solaris)
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
     8
 
+PTLIB_BASE	= pt
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
     9
 
+else
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    10
 
 PTLIB_BASE	= pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    11
 
+endif
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    12
 
 PTLIB_FILE	= lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    13
 
 PT_OBJBASE	= obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    14
 
 PT_OBJDIR	= $(PW_LIBDIR)/$(PT_OBJBASE)
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    15
 
--- pwlib/Makefile.in.ori	2006-03-21 14:04:10.817511000 +0800
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    16
 
+++ pwlib/Makefile.in	2006-03-21 14:05:29.269154000 +0800
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    17
 
@@ -267,10 +267,12 @@
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    18
 
 		rm -f  $(PTLIB_FILE) ; \
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    19
 
 		ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(PTLIB_FILE) \
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    20
 
 	)
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    21
 
+ifneq ($(PTLIB_FILE),libpt.@SHAREDLIBEXT@)
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    22
 
 	(cd $(DESTDIR)$(LIBDIR); \
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    23
 
 		rm -f  libpt.@SHAREDLIBEXT@ ; \
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    24
 
 		ln -sf $(PTLIB_FILE) libpt.@SHAREDLIBEXT@ \
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    25
 
 	)
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    26
 
+endif
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    27
 
 ifeq (1, $(HAS_PLUGINS))
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    28
 
 	cd plugins/pwlib/device/ ; \
f6139a459609 changed all reference of "gnomemeeting" to "ekiga"
jl141263
parents:
diff changeset 
    29
 
 	( for dir in ./* ;\
sustaining/oi_151a/spec-files