Attachment #266517 for bug #343699




PHP         = @PHP@
PG_CONFIG   = @PG_CONFIG@

LIB_NAME    = libossp-uuid.la
LIB_OBJS    = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo

DCE_NAME    = libossp-uuid_dce.la
DCE_OBJS    = uuid_dce.lo $(LIB_OBJS)

CXX_NAME    = libossp-uuid++.la
CXX_OBJS    = uuid++.lo $(LIB_OBJS)

PRG_NAME    = uuid

	@$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<

$(LIB_NAME): $(LIB_OBJS)
	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
	    -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`

$(DCE_NAME): $(DCE_OBJS)
	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
	    -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`

$(CXX_NAME): $(CXX_OBJS)
	@$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
	    -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`

$(PRG_NAME): $(PRG_OBJS) $(LIB_NAME)

	-@if [ ".$(WITH_CXX)" = .yes ]; then \
	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \
	fi
	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/
	$(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/
	-@if [ ".$(WITH_PERL)" = .yes ]; then \
	    (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \

Lines 121-127 Link Here

(-)uuid-1.6.2.orig/uuid-config.in (-1 / +1 lines)
121	output_extra="$output_extra $uuid_ldflags"	121	output_extra="$output_extra $uuid_ldflags"
122	;;	122	;;
123	--libs)	123	--libs)
124	output="$output -luuid"	124	output="$output -lossp-uuid"
125	output_extra="$output_extra $uuid_libs"	125	output_extra="$output_extra $uuid_libs"
126	;;	126	;;
127	* )	127	* )

Lines 36-42 Link Here

(-)uuid-1.6.2.orig/uuid.pc.in (-2 / +2 lines)
36	Description: Universally Unique Identifier (UUID) Library	36	Description: Universally Unique Identifier (UUID) Library
37	Version: @UUID_VERSION_RAW@	37	Version: @UUID_VERSION_RAW@
38	URL: http://www.ossp.org/pkg/lib/uuid/	38	URL: http://www.ossp.org/pkg/lib/uuid/
39	Cflags: -I${includedir}	39	Cflags: -I${includedir}/ossp
40	Libs: -L${libdir} -luuid	40	Libs: -L${libdir} -lossp-uuid
41	Libs.private: @LIBS@	41	Libs.private: @LIBS@
42		42

Return to bug 343699

Lines 62-74 Link Here

(-)uuid-1.6.2.orig/Makefile.in (-7 / +7 lines)
62	PHP = @PHP@	62	PHP = @PHP@
63	PG_CONFIG = @PG_CONFIG@	63	PG_CONFIG = @PG_CONFIG@
64		64
65	LIB_NAME = libuuid.la	65	LIB_NAME = libossp-uuid.la
66	LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo	66	LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
67		67
68	DCE_NAME = libuuid_dce.la	68	DCE_NAME = libossp-uuid_dce.la
69	DCE_OBJS = uuid_dce.lo $(LIB_OBJS)	69	DCE_OBJS = uuid_dce.lo $(LIB_OBJS)
70		70
71	CXX_NAME = libuuid++.la	71	CXX_NAME = libossp-uuid++.la
72	CXX_OBJS = uuid++.lo $(LIB_OBJS)	72	CXX_OBJS = uuid++.lo $(LIB_OBJS)
73		73
74	PRG_NAME = uuid	74	PRG_NAME = uuid
Lines 112-126 Link Here
112	@$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<	112	@$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
113		113
114	$(LIB_NAME): $(LIB_OBJS)	114	$(LIB_NAME): $(LIB_OBJS)
115	@$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \	115	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
116	-version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`	116	-version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
117		117
118	$(DCE_NAME): $(DCE_OBJS)	118	$(DCE_NAME): $(DCE_OBJS)
119	@$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \	119	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
120	-version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`	120	-version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
121		121
122	$(CXX_NAME): $(CXX_OBJS)	122	$(CXX_NAME): $(CXX_OBJS)
123	@$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \	123	@$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
124	-version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`	124	-version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
125		125
126	$(PRG_NAME): $(PRG_OBJS) $(LIB_NAME)	126	$(PRG_NAME): $(PRG_OBJS) $(LIB_NAME)
Lines 253-259 Link Here
253	-@if [ ".$(WITH_CXX)" = .yes ]; then \	253	-@if [ ".$(WITH_CXX)" = .yes ]; then \
254	$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \	254	$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \
255	fi	255	fi
256	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/	256	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/
257	$(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/	257	$(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/
258	-@if [ ".$(WITH_PERL)" = .yes ]; then \	258	-@if [ ".$(WITH_PERL)" = .yes ]; then \
259	(cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \	259	(cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \