diff options
| author | Michael Meeks <michael@helixcode.com> | 2000-12-21 01:13:13 (GMT) |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 2000-12-21 01:13:13 (GMT) |
| commit | 859f6f6582d603077cd089626623a3eb36348f07 (patch) | |
| tree | 2e9746f8485055217b24a3637fff4842e69d138b /pdf/xpdf/Makefile.am | |
| parent | db46d0ffc7e468e4e5cc41ac9544c190b38d9232 (diff) | |
Kill mutex / thread init code, it screws gtk.
2000-12-21 Michael Meeks <michael@helixcode.com>
* bonobo-application-x-pdf.cc: Kill mutex / thread init code,
it screws gtk.
* gpdf.cc: update the IID naming scheme.
* bonobo-application-x-pdf.cc (init_bonobo_application_x_pdf_factory):
ditto. (init_server_factory): setup ORB properly.
* Makefile.am: De-goadize; update oafinfo fnames.
Diffstat (limited to 'pdf/xpdf/Makefile.am')
| -rw-r--r-- | pdf/xpdf/Makefile.am | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am index faefcd9..b4ea2ed 100644 --- a/pdf/xpdf/Makefile.am +++ b/pdf/xpdf/Makefile.am @@ -1,10 +1,4 @@ -if USING_OAF -OBJECT_DIRECTORY_LIBS=$(OAF_LIBS) $(GNOMEUI_LIBS) -else -OBJECT_DIRECTORY_LIBS=$(GNOMEGNORBA_LIBS) -endif - INCLUDES = \ -I$(top_srcdir)/goo \ -I$(top_srcdir)/ltk \ @@ -18,7 +12,11 @@ else gui = xpdf endif -bin_PROGRAMS = pdftops pdftotext pdfinfo pdftopbm pdfimages $(gui) bonobo-application-x-pdf +bin_PROGRAMS = \ + pdftops pdftotext \ + pdfinfo pdftopbm \ + pdfimages $(gui) \ + bonobo-application-x-pdf common_sources = \ Array.cc \ @@ -77,7 +75,6 @@ gpdf_SOURCES = \ gpdf_LDADD = \ $(GTK_LIBS) \ $(GNOME_LIBDIR) \ - $(OBJECT_DIRECTORY_LIBS) \ $(EXTRA_GNOME_LIBS) \ $(INTLLIBS) @@ -96,7 +93,6 @@ bonobo_application_x_pdf_LDADD = \ ../goo/libgoo.a \ $(GTK_LIBS) \ $(GNOME_LIBDIR) \ - $(OBJECT_DIRECTORY_LIBS) \ $(EXTRA_GNOME_LIBS) \ $(EXTRA_GLIB_LIBS) \ $(INTLLIBS) @@ -169,17 +165,8 @@ ltk = \ xpdf-top.ltk \ xpdf.ltk -goaddir = $(sysconfdir)/CORBA/servers oafdir = $(datadir)/oaf - -if USING_OAF -oaf_DATA = $(OAF_FILES) -else -goad_DATA = $(GOAD_FILES) -endif - -GOAD_FILES = application-x-pdf.gnorba -OAF_FILES = application-x-pdf.oafinfo +oaf_DATA = GNOME_XPDF.oafinfo XML_FILES = \ gpdf-ui.xml \ @@ -188,7 +175,7 @@ XML_FILES = \ uidir = $(datadir)/gnome/ui ui_DATA = $(XML_FILES) -EXTRA_DIST = $(bitmaps) ChangeLog $(ltk) $(GOAD_FILES) \ - $(OAF_FILES) config.h $(XML_FILES) +EXTRA_DIST = $(bitmaps) ChangeLog $(ltk) \ + $(oaf_DATA) config.h $(XML_FILES) |