Context Navigation

Changeset 1308

Timestamp:

03/05/07 22:33:10 (21 months ago)

Author:

jmoore

Message:

#601 Reverting to libtool. Don't ask. It works now.

Location:

branches/icy_omero/components/icy-model

Files:

Property svn:ignore

r1306	r1308
36	36	AC_PROG_MAKE_SET
37	37	AC_PROG_RANLIB
	38	AC_PROG_LIBTOOL
38	39
39	40	dnl Do it early just in case any weird checks require it...

Property svn:ignore

r1306	r1308
	1	AUTOMAKE_OPTIONS = foreign
	2
1	3	SLICE_DIR=@SLICE_DIR@
2	4	SLICE_OME=../../resources/slice
…	…
19	21	@SLICE2CPP@ $(SLICE_INCLUDES) --output-dir=$(CPP_GEN) $(SLICE_OME)/*.ice
20	22
21		# ./generated/ObjectFactoryRegistrar.cpp
22
23		lib_LIBRARIES = libOMERO_model.a libOMERO_client.a
24		libOMERO_model_a_SOURCES = ./DetailsI.cpp ./PermissionsI.cpp \
	23	lib_LTLIBRARIES = libOMERO_model.la libOMERO_client.la
	24	libOMERO_model_la_SOURCES = ./DetailsI.cpp ./PermissionsI.cpp \
25	25	./generated/AberrationCorrection.cpp \
26	26	./generated/AberrationCorrectionI.cpp \
…	…
315	315	#libOMERO_model_a_LDFLAGS = -no-undefined -version-info 0:0:0
316	316
317		libOMERO_client_~~a_SOURCES= ./OMERO/client.cpp~~
318		libOMERO_client_~~a_LIBADD = libOMERO_model.~~a
	317	libOMERO_client_la_SOURCES= ./OMERO/client.cpp ./generated/ObjectFactoryRegistrar.cpp
	318	libOMERO_client_la_LIBADD = libOMERO_model.la
319	319	#libOMERO_client_a_LDFLAGS= -no-undefined -version-info 0:0:0
320	320
321	321	bin_PROGRAMS = OMERO.demo
322	322	OMERO_demo_SOURCES = main.cpp
323		OMERO_demo_LDADD = libOMERO_model.a libOMERO_client.a
324
	323	OMERO_demo_LDADD = libOMERO_client.la
	324
	325