]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Drop shared libraries for internal libraries (mirror change from master).
authorMichael R Sweet <michael.r.sweet@gmail.com>
Wed, 7 Nov 2018 19:21:03 +0000 (14:21 -0500)
committerMichael R Sweet <michael.r.sweet@gmail.com>
Wed, 7 Nov 2018 19:21:03 +0000 (14:21 -0500)
.gitignore
Makedefs.in
Makefile
cgi-bin/Makefile
cgi-bin/makedocset.c [deleted file]
config-scripts/cups-sharedlibs.m4
configure
doc/Makefile
ppdc/Makefile
scheduler/Makefile

index 3fb3e78cc4c976cd0119258d3dfa20dedccd730f..af2ac79d44d9138e4e06e1074369735c8be1957e 100644 (file)
@@ -1,12 +1,7 @@
 *.a
 *.bck
-*.cgi
-*.dylib
 *.gz
 *.o
-*.so
-*.so.*
-*.tokens
 .buildrev
 autom4te.cache
 config.h
@@ -29,7 +24,11 @@ berkeley/lpc
 berkeley/lpq
 berkeley/lpr
 berkeley/lprm
-cgi-bin/makedocset
+cgi-bin/admin.cgi
+cgi-bin/classes.cgi
+cgi-bin/help.cgi
+cgi-bin/jobs.cgi
+cgi-bin/printers.cgi
 cgi-bin/testcgi
 cgi-bin/testhi
 cgi-bin/testhi.index
@@ -39,6 +38,10 @@ conf/cupsd.conf
 conf/mime.convs
 conf/pam.std
 conf/snmp.conf
+cups/libcups.2.dylib
+cups/libcups.dylib
+cups/libcups.so
+cups/libcups.so.2
 cups/locale/
 cups/test.pwg
 cups/testadmin
@@ -64,6 +67,10 @@ doc/index.html
 doc/*/index.html
 filter/commandtops
 filter/gziptoany
+filter/libcupsimage.2.dylib
+filter/libcupsimage.dylib
+filter/libcupsimage.so
+filter/libcupsimage.so.2
 filter/pstops
 filter/rasterbench
 filter/rastertoepson
index 0427fc7ade0ac3bebeae2c2b64f4547535d5bd30..f614c0c1d711574af7ad688f7649e50c9a536abc 100644 (file)
@@ -95,10 +95,7 @@ LOCALTARGET     =       @LOCALTARGET@
 #
 
 LIBCUPS                =       @LIBCUPS@
-LIBCUPSCGI     =       @LIBCUPSCGI@
 LIBCUPSIMAGE   =       @LIBCUPSIMAGE@
-LIBCUPSMIME    =       @LIBCUPSMIME@
-LIBCUPSPPDC    =       @LIBCUPSPPDC@
 LIBCUPSSTATIC  =       @LIBCUPSSTATIC@
 LIBGSSAPI      =       @LIBGSSAPI@
 LIBMALLOC      =       @LIBMALLOC@
index afc90ce1e5c0c6da79d8867021f3f8c7495482a3..ddb3a5f53ae1240e2531e11f38ce14c97a5b3ad1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Top-level Makefile for CUPS.
 #
-# Copyright 2007-2016 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -272,32 +272,6 @@ apihelp:
        done
 
 
-#
-# Create an Xcode docset using Mini-XML's mxmldoc (http://www.msweet.org/)...
-#
-
-docset:        apihelp
-       echo Generating docset directory tree...
-       $(RM) -r org.cups.docset
-       mkdir -p org.cups.docset/Contents/Resources/Documentation/help
-       mkdir -p org.cups.docset/Contents/Resources/Documentation/images
-       cd man; $(MAKE) $(MFLAGS) html
-       cd doc; $(MAKE) $(MFLAGS) docset
-       cd cgi-bin; $(MAKE) $(MFLAGS) makedocset
-       cgi-bin/makedocset org.cups.docset \
-               `svnversion . | sed -e '1,$$s/[a-zA-Z]//g'` \
-               doc/help/api-*.tokens
-       $(RM) doc/help/api-*.tokens
-       echo Indexing docset...
-       /Applications/Xcode.app/Contents/Developer/usr/bin/docsetutil index org.cups.docset
-       echo Generating docset archive and feed...
-       $(RM) org.cups.docset.atom
-       /Applications/Xcode.app/Contents/Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
-               --atom org.cups.docset.atom \
-               --download-url http://www.cups.org/org.cups.docset.xar \
-               org.cups.docset
-
-
 #
 # Lines of code computation...
 #
index f790a16540737fcce0d44a02ce708b98d0e8cd97..24fdd1ac8d6056444193e148638d2cd39a7c7230 100644 (file)
@@ -1,7 +1,7 @@
 #
 # CGI makefile for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -26,7 +26,6 @@ OBJS  =       \
                classes.o \
                help.o \
                jobs.o \
-               makedocset.o \
                printers.o \
                testcgi.o \
                testhi.o \
@@ -38,8 +37,7 @@ CGIS  =       \
                jobs.cgi \
                printers.cgi
 LIBTARGETS =   \
-               libcupscgi.a \
-               $(LIBCUPSCGI)
+               libcupscgi.a
 
 UNITTARGETS =  \
                testcgi \
@@ -77,8 +75,7 @@ unittests:    $(UNITTARGETS)
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset
-       $(RM) libcupscgi.so libcupscgi.dylib
+       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
 
 
 #
@@ -126,42 +123,13 @@ install-exec:
 #
 
 install-headers:
-       if test "x$(privateinclude)" != x; then \
-               echo Installing private header files into $(PRIVATEINCLUDE)...; \
-               $(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
-               for file in cgi.h help-index.h; do \
-                       $(INSTALL_DATA) $$file $(PRIVATEINCLUDE); \
-               done; \
-       fi
 
 
 #
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC)
-       echo Installing libraries in $(LIBDIR)...
-       $(INSTALL_DIR) -m 755 $(LIBDIR)
-       $(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR)
-       if test $(LIBCUPSCGI) = "libcupscgi.so.1"; then \
-               $(RM) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
-               $(LN) $(LIBCUPSCGI) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
-       fi
-       if test $(LIBCUPSCGI) = "libcupscgi.1.dylib"; then \
-               $(RM) $(LIBDIR)/libcupscgi.dylib; \
-               $(LN) $(LIBCUPSCGI) $(LIBDIR)/libcupscgi.dylib; \
-       fi
-       if test "x$(SYMROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SYMROOT); \
-               cp $(LIBCUPSCGI) $(SYMROOT); \
-               dsymutil $(SYMROOT)/$(LIBCUPSCGI); \
-       fi
-
-installstatic:
-       $(INSTALL_DIR) -m 755 $(LIBDIR)
-       $(INSTALL_LIB) -m 755 libcupscgi.a $(LIBDIR)
-       $(RANLIB) $(LIBDIR)/libcupscgi.a
-       $(CHMOD) 555 $(LIBDIR)/libcupscgi.a
+install-libs:
 
 
 #
@@ -173,56 +141,6 @@ uninstall:
                $(RM) $(SERVERBIN)/cgi-bin/$$file; \
        done
        -$(RMDIR) $(SERVERBIN)/cgi-bin
-       $(RM) $(LIBDIR)/libcupscgi.1.dylib
-       $(RM) $(LIBDIR)/libcupscgi.a
-       $(RM) $(LIBDIR)/libcupscgi.dylib
-       $(RM) $(LIBDIR)/libcupscgi.so
-       $(RM) $(LIBDIR)/libcupscgi.so.1
-       -$(RMDIR) $(LIBDIR)
-       -if test "x$(privateinclude)" != x; then \
-               $(RM) $(PRIVATEINCLUDE)/cgi.h; \
-               $(RM) $(PRIVATEINCLUDE)/help-index.h; \
-               $(RMDIR) $(PRIVATEINCLUDE); \
-       fi
-
-
-#
-# libcupscgi.so.1
-#
-
-libcupscgi.so.1:       $(LIBOBJS)
-       echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
-       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-       $(RM) `basename $@ .1`
-       $(LN) $@ `basename $@ .1`
-
-
-#
-# libcupscgi.1.dylib
-#
-
-libcupscgi.1.dylib:    $(LIBOBJS) libcupscgi.exp
-       echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
-               -install_name $(libdir)/$@ \
-               -current_version 1.0.0 \
-               -compatibility_version 1.0.0 \
-               -exported_symbols_list libcupscgi.exp \
-               $(LIBOBJS) $(LIBS)
-       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-       $(RM) libcupscgi.dylib
-       $(LN) $@ libcupscgi.dylib
-
-
-#
-# libcupscgi.la
-#
-
-libcupscgi.la:    $(LIBOBJS)
-       echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-               -version-info 1:0 $(LIBS)
 
 
 #
@@ -240,9 +158,9 @@ libcupscgi.a:       $(LIBOBJS)
 # admin.cgi
 #
 
-admin.cgi:     admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+admin.cgi:     admin.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ admin.o libcupscgi.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -250,9 +168,9 @@ admin.cgi:  admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 # classes.cgi
 #
 
-classes.cgi:   classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+classes.cgi:   classes.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ classes.o libcupscgi.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -260,9 +178,9 @@ classes.cgi:        classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 # help.cgi
 #
 
-help.cgi:      help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+help.cgi:      help.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ help.o libcupscgi.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -270,21 +188,9 @@ help.cgi:  help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 # jobs.cgi
 #
 
-jobs.cgi:      jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+jobs.cgi:      jobs.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS)
-       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-
-
-#
-# makedocset
-#
-
-makedocset:    makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
-       echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
-               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
-               $(LIBZ) $(LIBGSSAPI)
+       $(LD_CC) $(LDFLAGS) -o $@ jobs.o libcupscgi.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -292,9 +198,9 @@ makedocset: makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 # printers.cgi
 #
 
-printers.cgi:  printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+printers.cgi:  printers.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ printers.o -L. -lcupscgi $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ printers.o -L. libcupscgi.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c
deleted file mode 100644 (file)
index 5a72177..0000000
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- * Xcode documentation set generator.
- *
- * Copyright 2007-2012 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
- *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * missing or damaged, see the license at "http://www.cups.org/".
- *
- * Usage:
- *
- *   makedocset directory *.tokens
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi-private.h"
-#include <errno.h>
-
-
-/*
- * Local structures...
- */
-
-typedef struct _cups_html_s            /**** Help file ****/
-{
-  char         *path;                  /* Path to help file */
-  char         *title;                 /* Title of help file */
-} _cups_html_t;
-
-typedef struct _cups_section_s         /**** Help section ****/
-{
-  char         *name;                  /* Section name */
-  cups_array_t *files;                 /* Files in this section */
-} _cups_section_t;
-
-
-/*
- * Local functions...
- */
-
-static int     compare_html(_cups_html_t *a, _cups_html_t *b);
-static int     compare_sections(_cups_section_t *a, _cups_section_t *b);
-static int     compare_sections_files(_cups_section_t *a, _cups_section_t *b);
-static void    write_index(const char *path, help_index_t *hi);
-static void    write_info(const char *path, const char *revision);
-static void    write_nodes(const char *path, help_index_t *hi);
-
-
-/*
- * 'main()' - Test the help index code.
- */
-
-int                                    /* O - Exit status */
-main(int  argc,                                /* I - Number of command-line args */
-     char *argv[])                     /* I - Command-line arguments */
-{
-  int          i;                      /* Looping var */
-  char         path[1024],             /* Path to documentation */
-               line[1024];             /* Line from file */
-  help_index_t *hi;                    /* Help index */
-  cups_file_t  *tokens,                /* Tokens.xml file */
-               *fp;                    /* Current file */
-
-
-  if (argc < 4)
-  {
-    puts("Usage: makedocset directory revision *.tokens");
-    return (1);
-  }
-
- /*
-  * Index the help documents...
-  */
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Documentation", argv[1]);
-  if ((hi = helpLoadIndex(NULL, path)) == NULL)
-  {
-    fputs("makedocset: Unable to index help files!\n", stderr);
-    return (1);
-  }
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Documentation/index.html",
-           argv[1]);
-  write_index(path, hi);
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Nodes.xml", argv[1]);
-  write_nodes(path, hi);
-
- /*
-  * Write the Info.plist file...
-  */
-
-  snprintf(path, sizeof(path), "%s/Contents/Info.plist", argv[1]);
-  write_info(path, argv[2]);
-
- /*
-  * Merge the Tokens.xml files...
-  */
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Tokens.xml", argv[1]);
-  if ((tokens = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create \"%s\": %s\n", path,
-           strerror(errno));
-    return (1);
-  }
-
-  cupsFilePuts(tokens, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-  cupsFilePuts(tokens, "<Tokens version=\"1.0\">\n");
-
-  for (i = 3; i < argc; i ++)
-  {
-    if ((fp = cupsFileOpen(argv[i], "r")) == NULL)
-    {
-      fprintf(stderr, "makedocset: Unable to open \"%s\": %s\n", argv[i],
-             strerror(errno));
-      return (1);
-    }
-
-    if (!cupsFileGets(fp, line, sizeof(line)) || strncmp(line, "<?xml ", 6) ||
-        !cupsFileGets(fp, line, sizeof(line)) || strncmp(line, "<Tokens ", 8))
-    {
-      fprintf(stderr, "makedocset: Bad Tokens.xml file \"%s\"!\n", argv[i]);
-      return (1);
-    }
-
-    while (cupsFileGets(fp, line, sizeof(line)))
-    {
-      if (strcmp(line, "</Tokens>"))
-        cupsFilePrintf(tokens, "%s\n", line);
-    }
-
-    cupsFileClose(fp);
-  }
-
-  cupsFilePuts(tokens, "</Tokens>\n");
-
-  cupsFileClose(tokens);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'compare_html()' - Compare the titles of two HTML files.
- */
-
-static int                             /* O - Result of comparison */
-compare_html(_cups_html_t *a,          /* I - First file */
-             _cups_html_t *b)          /* I - Second file */
-{
-  return (_cups_strcasecmp(a->title, b->title));
-}
-
-
-/*
- * 'compare_sections()' - Compare the names of two help sections.
- */
-
-static int                             /* O - Result of comparison */
-compare_sections(_cups_section_t *a,   /* I - First section */
-                 _cups_section_t *b)   /* I - Second section */
-{
-  return (_cups_strcasecmp(a->name, b->name));
-}
-
-
-/*
- * 'compare_sections_files()' - Compare the number of files and section names.
- */
-
-static int                             /* O - Result of comparison */
-compare_sections_files(
-    _cups_section_t *a,                        /* I - First section */
-    _cups_section_t *b)                        /* I - Second section */
-{
-  int  ret = cupsArrayCount(b->files) - cupsArrayCount(a->files);
-
-  if (ret)
-    return (ret);
-  else
-    return (_cups_strcasecmp(a->name, b->name));
-}
-
-
-/*
- * 'write_index()' - Write an index file for the CUPS help.
- */
-
-static void
-write_index(const char   *path,                /* I - File to write */
-            help_index_t *hi)          /* I - Index of files */
-{
-  cups_file_t          *fp;            /* Output file */
-  help_node_t          *node;          /* Current help node */
-  _cups_section_t      *section,       /* Current section */
-                       key;            /* Section search key */
-  _cups_html_t         *html;          /* Current HTML file */
-  cups_array_t         *sections,      /* Sections in index */
-                       *sections_files,/* Sections sorted by size */
-                       *columns[3];    /* Columns in final HTML file */
-  int                  column,         /* Current column */
-                       lines[3],       /* Number of lines in each column */
-                       min_column,     /* Smallest column */
-                       min_lines;      /* Smallest number of lines */
-
-
- /*
-  * Build an array of sections and their files.
-  */
-
-  sections = cupsArrayNew((cups_array_func_t)compare_sections, NULL);
-
-  for (node = (help_node_t *)cupsArrayFirst(hi->nodes);
-       node;
-       node = (help_node_t *)cupsArrayNext(hi->nodes))
-  {
-    if (node->anchor)
-      continue;
-
-    key.name = node->section ? node->section : "Miscellaneous";
-    if ((section = (_cups_section_t *)cupsArrayFind(sections, &key)) == NULL)
-    {
-      section        = (_cups_section_t *)calloc(1, sizeof(_cups_section_t));
-      section->name  = key.name;
-      section->files = cupsArrayNew((cups_array_func_t)compare_html, NULL);
-
-      cupsArrayAdd(sections, section);
-    }
-
-    html = (_cups_html_t *)calloc(1, sizeof(_cups_html_t));
-    html->path  = node->filename;
-    html->title = node->text;
-
-    cupsArrayAdd(section->files, html);
-  }
-
- /*
-  * Build a sorted list of sections based on the number of files in each section
-  * and the section name...
-  */
-
-  sections_files = cupsArrayNew((cups_array_func_t)compare_sections_files,
-                                NULL);
-  for (section = (_cups_section_t *)cupsArrayFirst(sections);
-       section;
-       section = (_cups_section_t *)cupsArrayNext(sections))
-    cupsArrayAdd(sections_files, section);
-
- /*
-  * Then build three columns to hold everything, trying to balance the number of
-  * lines in each column...
-  */
-
-  for (column = 0; column < 3; column ++)
-  {
-    columns[column] = cupsArrayNew((cups_array_func_t)compare_sections, NULL);
-    lines[column]   = 0;
-  }
-
-  for (section = (_cups_section_t *)cupsArrayFirst(sections_files);
-       section;
-       section = (_cups_section_t *)cupsArrayNext(sections_files))
-  {
-    for (min_column = 0, min_lines = lines[0], column = 1;
-         column < 3;
-        column ++)
-    {
-      if (lines[column] < min_lines)
-      {
-        min_column = column;
-        min_lines  = lines[column];
-      }
-    }
-
-    cupsArrayAdd(columns[min_column], section);
-    lines[min_column] += cupsArrayCount(section->files) + 2;
-  }
-
- /*
-  * Write the HTML file...
-  */
-
-  if ((fp = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
-            strerror(errno));
-    exit(1);
-  }
-
-  cupsFilePuts(fp, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 "
-                   "Transitional//EN\" "
-                  "\"http://www.w3.org/TR/html4/loose.dtd\">\n"
-                  "<html>\n"
-                  "<head>\n"
-                  "<title>CUPS Documentation</title>\n"
-                  "<link rel='stylesheet' type='text/css' "
-                  "href='cups-printable.css'>\n"
-                  "</head>\n"
-                  "<body>\n"
-                  "<h1 class='title'>CUPS Documentation</h1>\n"
-                  "<table width='100%' summary=''>\n"
-                  "<tr>\n");
-
-  for (column = 0; column < 3; column ++)
-  {
-    if (column)
-      cupsFilePuts(fp, "<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n");
-
-    cupsFilePuts(fp, "<td valign='top' width='33%'>");
-    for (section = (_cups_section_t *)cupsArrayFirst(columns[column]);
-         section;
-        section = (_cups_section_t *)cupsArrayNext(columns[column]))
-    {
-      cupsFilePrintf(fp, "<h2 class='title'>%s</h2>\n", section->name);
-      for (html = (_cups_html_t *)cupsArrayFirst(section->files);
-           html;
-          html = (_cups_html_t *)cupsArrayNext(section->files))
-       cupsFilePrintf(fp, "<p class='compact'><a href='%s'>%s</a></p>\n",
-                      html->path, html->title);
-    }
-    cupsFilePuts(fp, "</td>\n");
-  }
-  cupsFilePuts(fp, "</tr>\n"
-                   "</table>\n"
-                  "</body>\n"
-                  "</html>\n");
-  cupsFileClose(fp);
-}
-
-
-/*
- * 'write_info()' - Write the Info.plist file.
- */
-
-static void
-write_info(const char *path,           /* I - File to write */
-           const char *revision)       /* I - Subversion revision number */
-{
-  cups_file_t  *fp;                    /* File */
-
-
-  if ((fp = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
-            strerror(errno));
-    exit(1);
-  }
-
-  cupsFilePrintf(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                    "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" "
-                    "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-                    "<plist version=\"1.0\">\n"
-                    "<dict>\n"
-                    "\t<key>CFBundleIdentifier</key>\n"
-                    "\t<string>org.cups.docset</string>\n"
-                    "\t<key>CFBundleName</key>\n"
-                    "\t<string>CUPS Documentation</string>\n"
-                    "\t<key>CFBundleVersion</key>\n"
-                    "\t<string>%d.%d.%s</string>\n"
-                    "\t<key>CFBundleShortVersionString</key>\n"
-                    "\t<string>%d.%d.%d</string>\n"
-                    "\t<key>DocSetFeedName</key>\n"
-                    "\t<string>cups.org</string>\n"
-                    "\t<key>DocSetFeedURL</key>\n"
-                    "\t<string>http://www.cups.org/org.cups.docset.atom"
-                    "</string>\n"
-                    "\t<key>DocSetPublisherIdentifier</key>\n"
-                    "\t<string>org.cups</string>\n"
-                    "\t<key>DocSetPublisherName</key>\n"
-                    "\t<string>CUPS</string>\n"
-                    "</dict>\n"
-                    "</plist>\n",
-                    CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, revision,
-                    CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH);
-
-  cupsFileClose(fp);
-}
-
-
-/*
- * 'write_nodes()' - Write the Nodes.xml file.
- */
-
-static void
-write_nodes(const char   *path,                /* I - File to write */
-            help_index_t *hi)          /* I - Index of files */
-{
-  cups_file_t  *fp;                    /* Output file */
-  int          id;                     /* Current node ID */
-  help_node_t  *node;                  /* Current help node */
-  int          subnodes;               /* Currently in Subnodes for file? */
-  int          needclose;              /* Need to close the current node? */
-
-
-  if ((fp = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
-            strerror(errno));
-    exit(1);
-  }
-
-  cupsFilePuts(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                  "<DocSetNodes version=\"1.0\">\n"
-                  "<TOC>\n"
-                  "<Node id=\"0\">\n"
-                  "<Name>CUPS Documentation</Name>\n"
-                  "<Path>Documentation/index.html</Path>\n"
-                  "</Node>\n");
-
-  for (node = (help_node_t *)cupsArrayFirst(hi->nodes), id = 1, subnodes = 0,
-           needclose = 0;
-       node;
-       node = (help_node_t *)cupsArrayNext(hi->nodes), id ++)
-  {
-    if (node->anchor)
-    {
-      if (!subnodes)
-      {
-        cupsFilePuts(fp, "<Subnodes>\n");
-       subnodes = 1;
-      }
-
-      cupsFilePrintf(fp, "<Node id=\"%d\">\n"
-                         "<Path>Documentation/%s</Path>\n"
-                        "<Anchor>%s</Anchor>\n"
-                        "<Name>%s</Name>\n"
-                        "</Node>\n", id, node->filename, node->anchor,
-                    node->text);
-    }
-    else
-    {
-      if (subnodes)
-      {
-        cupsFilePuts(fp, "</Subnodes>\n");
-       subnodes = 0;
-      }
-
-      if (needclose)
-        cupsFilePuts(fp, "</Node>\n");
-
-      cupsFilePrintf(fp, "<Node id=\"%d\">\n"
-                         "<Path>Documentation/%s</Path>\n"
-                        "<Name>%s</Name>\n", id, node->filename, node->text);
-      needclose = 1;
-    }
-  }
-
-  if (subnodes)
-    cupsFilePuts(fp, "</Subnodes>\n");
-
-  if (needclose)
-    cupsFilePuts(fp, "</Node>\n");
-
-  cupsFilePuts(fp, "</TOC>\n"
-                  "</DocSetNodes>\n");
-
-  cupsFileClose(fp);
-}
index 6e6b582392602ead3dff7bdfe8f7eea31b5f3d5b..bf68e4fab3884c6b4c0c570be69174dbf7b34275 100644 (file)
@@ -1,7 +1,7 @@
 dnl
 dnl Shared library support for CUPS.
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 2007-2018 by Apple Inc.
 dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl These coded instructions, statements, and computer programs are the
@@ -24,30 +24,21 @@ if test x$enable_shared != xno; then
        case "$host_os_name" in
                sunos*)
                        LIBCUPS="lib$cupsbase.so.2"
-                       LIBCUPSCGI="libcupscgi.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
-                       LIBCUPSMIME="libcupsmime.so.1"
-                       LIBCUPSPPDC="libcupsppdc.so.1"
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
                        ;;
                linux* | gnu* | *bsd*)
                        LIBCUPS="lib$cupsbase.so.2"
-                       LIBCUPSCGI="libcupscgi.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
-                       LIBCUPSMIME="libcupsmime.so.1"
-                       LIBCUPSPPDC="libcupsppdc.so.1"
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
                        ;;
                darwin*)
                        LIBCUPS="lib$cupsbase.2.dylib"
-                       LIBCUPSCGI="libcupscgi.1.dylib"
                        LIBCUPSIMAGE="libcupsimage.2.dylib"
-                       LIBCUPSMIME="libcupsmime.1.dylib"
-                       LIBCUPSPPDC="libcupsppdc.1.dylib"
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc"
@@ -56,10 +47,7 @@ if test x$enable_shared != xno; then
                        echo "Warning: shared libraries may not be supported.  Trying -shared"
                        echo "         option with compiler."
                        LIBCUPS="lib$cupsbase.so.2"
-                       LIBCUPSCGI="libcupscgi.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
-                       LIBCUPSMIME="libcupsmime.so.1"
-                       LIBCUPSPPDC="libcupsppdc.so.1"
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
@@ -68,10 +56,7 @@ if test x$enable_shared != xno; then
 else
        PICFLAG=0
        LIBCUPS="lib$cupsbase.a"
-       LIBCUPSCGI="libcupscgi.a"
        LIBCUPSIMAGE="libcupsimage.a"
-       LIBCUPSMIME="libcupsmime.a"
-       LIBCUPSPPDC="libcupsppdc.a"
        DSO=":"
        DSOXX=":"
 fi
@@ -81,10 +66,7 @@ AC_SUBST(DSOXX)
 AC_SUBST(DSOFLAGS)
 AC_SUBST(LIBCUPS)
 AC_SUBST(LIBCUPSBASE)
-AC_SUBST(LIBCUPSCGI)
 AC_SUBST(LIBCUPSIMAGE)
-AC_SUBST(LIBCUPSMIME)
-AC_SUBST(LIBCUPSPPDC)
 AC_SUBST(LIBCUPSSTATIC)
 
 if test x$enable_shared = xno; then
index 17d1834dacda4e8a484ba4c3769d946eb8e535d6..5c2ce69caf9396bd61c0802506b25c16b33412f5 100755 (executable)
--- a/configure
+++ b/configure
@@ -692,10 +692,7 @@ LINKCUPS
 EXTLINKCUPSIMAGE
 EXTLINKCUPS
 LIBCUPSSTATIC
-LIBCUPSPPDC
-LIBCUPSMIME
 LIBCUPSIMAGE
-LIBCUPSCGI
 LIBCUPSBASE
 LIBCUPS
 DSOFLAGS
@@ -6609,30 +6606,21 @@ if test x$enable_shared != xno; then
        case "$host_os_name" in
                sunos*)
                        LIBCUPS="lib$cupsbase.so.2"
-                       LIBCUPSCGI="libcupscgi.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
-                       LIBCUPSMIME="libcupsmime.so.1"
-                       LIBCUPSPPDC="libcupsppdc.so.1"
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
                        ;;
                linux* | gnu* | *bsd*)
                        LIBCUPS="lib$cupsbase.so.2"
-                       LIBCUPSCGI="libcupscgi.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
-                       LIBCUPSMIME="libcupsmime.so.1"
-                       LIBCUPSPPDC="libcupsppdc.so.1"
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
                        ;;
                darwin*)
                        LIBCUPS="lib$cupsbase.2.dylib"
-                       LIBCUPSCGI="libcupscgi.1.dylib"
                        LIBCUPSIMAGE="libcupsimage.2.dylib"
-                       LIBCUPSMIME="libcupsmime.1.dylib"
-                       LIBCUPSPPDC="libcupsppdc.1.dylib"
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc"
@@ -6641,10 +6629,7 @@ if test x$enable_shared != xno; then
                        echo "Warning: shared libraries may not be supported.  Trying -shared"
                        echo "         option with compiler."
                        LIBCUPS="lib$cupsbase.so.2"
-                       LIBCUPSCGI="libcupscgi.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
-                       LIBCUPSMIME="libcupsmime.so.1"
-                       LIBCUPSPPDC="libcupsppdc.so.1"
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
@@ -6653,10 +6638,7 @@ if test x$enable_shared != xno; then
 else
        PICFLAG=0
        LIBCUPS="lib$cupsbase.a"
-       LIBCUPSCGI="libcupscgi.a"
        LIBCUPSIMAGE="libcupsimage.a"
-       LIBCUPSMIME="libcupsmime.a"
-       LIBCUPSPPDC="libcupsppdc.a"
        DSO=":"
        DSOXX=":"
 fi
@@ -6669,9 +6651,6 @@ fi
 
 
 
-
-
-
 if test x$enable_shared = xno; then
        LINKCUPS="../cups/lib$cupsbase.a"
        LINKCUPSIMAGE="../filter/libcupsimage.a"
index 3b1b71178fb269152ec5e9adca1bd21dcb942226..243fc7ce0c595768188cc4dd411a35bd4589e6a0 100644 (file)
@@ -1,7 +1,7 @@
 #
 # Documentation makefile for CUPS.
 #
-# Copyright 2007-2016 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -236,13 +236,3 @@ uninstall-languages:
        done
 
 install-langbundle:
-
-
-#
-# Install the docset bits locally...
-#
-
-docset:
-       cp $(HELPFILES) ../org.cups.docset/Contents/Resources/Documentation/help
-       cp cups-printable.css ../org.cups.docset/Contents/Resources/Documentation
-       cp $(HELPIMAGES) ../org.cups.docset/Contents/Resources/Documentation/images
index bdf8e172766a3a65eab3816779420f221886adbb..e56398865fab4a7040486c6d575bf6b51766874d 100644 (file)
@@ -1,7 +1,7 @@
 #
 # Makefile for the CUPS PPD Compiler.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 2002-2006 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -52,7 +52,6 @@ OBJS =                \
                ppdpo.o \
                testcatalog.o
 LIBTARGETS =   \
-               $(LIBCUPSPPDC) \
                libcupsppdc.a
 UNITTARGETS =  \
                ppdc-static \
@@ -102,7 +101,6 @@ clean:
        $(RM) $(TARGETS) $(UNITTARGETS) genstrings
        $(RM) -r ppd ppd2
        $(RM) sample-import.drv sample.c test.drv
-       $(RM) libcupsppdc.so libcupsppdc.dylib
 
 
 #
@@ -153,40 +151,13 @@ install-exec:
 #
 
 install-headers:
-       if test "x$(privateinclude)" != x; then \
-               echo Installing private header files into $(PRIVATEINCLUDE)...; \
-               $(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
-               $(INSTALL_DATA) ppdc.h $(PRIVATEINCLUDE); \
-       fi
 
 
 #
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC)
-       echo Installing libraries in $(LIBDIR)...
-       $(INSTALL_DIR) -m 755 $(LIBDIR)
-       $(INSTALL_LIB) $(LIBCUPSPPDC) $(LIBDIR)
-       if test $(LIBCUPSPPDC) = "libcupsppdc.so.1"; then \
-               $(RM) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
-               $(LN) $(LIBCUPSPPDC) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
-       fi
-       if test $(LIBCUPSPPDC) = "libcupsppdc.1.dylib"; then \
-               $(RM) $(LIBDIR)/libcupsppdc.dylib; \
-               $(LN) $(LIBCUPSPPDC) $(LIBDIR)/libcupsppdc.dylib; \
-       fi
-       if test "x$(SYMROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SYMROOT); \
-               cp $(LIBCUPSPPDC) $(SYMROOT); \
-               dsymutil $(SYMROOT)/$(LIBCUPSPPDC); \
-       fi
-
-installstatic:
-       $(INSTALL_DIR) -m 755 $(LIBDIR)
-       $(INSTALL_LIB) -m 755 libcupsppdc.a $(LIBDIR)
-       $(RANLIB) $(LIBDIR)/libcupsppdc.a
-       $(CHMOD) 555 $(LIBDIR)/libcupsppdc.a
+install-libs:
 
 
 #
@@ -199,16 +170,6 @@ uninstall:
        done
        $(RM) $(DATADIR)/drv/sample.drv
        $(RMDIR) $(DATADIR)/drv
-       $(RM) $(LIBDIR)/libcupsppdc.1.dylib
-       $(RM) $(LIBDIR)/libcupsppdc.a
-       $(RM) $(LIBDIR)/libcupsppdc.dylib
-       $(RM) $(LIBDIR)/libcupsppdc.so
-       $(RM) $(LIBDIR)/libcupsppdc.so.1
-       -$(RMDIR) $(LIBDIR)
-       -if test "x$(privateinclude)" != x; then \
-               $(RM) $(PRIVATEINCLUDE)/ppdc.h; \
-               $(RMDIR) $(PRIVATEINCLUDE); \
-       fi
 
 
 #
@@ -236,9 +197,9 @@ genstrings:         genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
 # ppdc, the PPD compiler.
 #
 
-ppdc:                  ppdc.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
+ppdc:                  ppdc.o libcupsppdc.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(LDFLAGS) -o $@ ppdc.o -L. -lcupsppdc $(LIBS)
+       $(LD_CXX) $(LDFLAGS) -o $@ ppdc.o libcupsppdc.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -257,9 +218,9 @@ ppdc-static:                ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
 # ppdhtml, the PPD to HTML utility.
 #
 
-ppdhtml:                       ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
+ppdhtml:                       ppdhtml.o libcupsppdc.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(LDFLAGS) -o $@ ppdhtml.o -L. -lcupsppdc $(LIBS)
+       $(LD_CXX) $(LDFLAGS) -o $@ ppdhtml.o libcupsppdc.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -267,9 +228,9 @@ ppdhtml:                    ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 # ppdi, import PPD files.
 #
 
-ppdi:                  ppdi.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
+ppdi:                  ppdi.o libcupsppdc.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(LDFLAGS) -o $@ ppdi.o -L. -lcupsppdc $(LIBS)
+       $(LD_CXX) $(LDFLAGS) -o $@ ppdi.o libcupsppdc.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -306,9 +267,9 @@ ppdmerge:                   ppdmerge.o ../cups/$(LIBCUPS)
 # ppdpo, create message catalog files.
 #
 
-ppdpo:                 ppdpo.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
+ppdpo:                 ppdpo.o libcupsppdc.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(LDFLAGS) -o $@ ppdpo.o -L. -lcupsppdc $(LIBS)
+       $(LD_CXX) $(LDFLAGS) -o $@ ppdpo.o libcupsppdc.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -324,47 +285,6 @@ testcatalog:               testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
-#
-# libcupsppdc.so.1
-#
-
-libcupsppdc.so.1:      $(LIBOBJS) ../cups/$(LIBCUPS)
-       echo Linking $@...
-       $(DSOXX) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LINKCUPS)
-       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-       $(RM) `basename $@ .1`
-       $(LN) $@ `basename $@ .1`
-
-
-#
-# libcupsppdc.1.dylib
-#
-
-libcupsppdc.1.dylib:   $(LIBOBJS) ../cups/$(LIBCUPS)
-       echo Creating export list for $@...
-       nm -gm $(LIBOBJS) | grep "__text" | grep -v weak | awk '{print $$NF}' | sort >t.exp
-       echo Linking $@...
-       $(DSOXX) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
-               -install_name $(libdir)/$@ \
-               -current_version 1.0.0 \
-               -compatibility_version 1.0.0 \
-               -exported_symbols_list t.exp \
-               $(LIBOBJS) $(LINKCUPS) $(COMMONLIBS)
-       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-       $(RM) libcupsppdc.dylib t.exp
-       $(LN) $@ libcupsppdc.dylib
-
-
-#
-# libcupsppdc.la
-#
-
-libcupsppdc.la:    $(LIBOBJS) ../cups/$(LIBCUPS)
-       echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-               -version-info 1:0 $(LINKCUPS)
-
-
 #
 # libcupsppdc.a
 #
index be9c7fec7846d153fb1a2af9401bfe5cf8b9485c..033b6b0234cf4388d63262d91c543f1b81b9f96e 100644 (file)
@@ -61,7 +61,6 @@ OBJS  =       \
                $(COBJS) \
                $(CXXOBJS)
 LIBTARGETS =   \
-               $(LIBCUPSMIME) \
                libcupsmime.a
 
 UNITTARGETS =  \
@@ -111,7 +110,6 @@ unittests:  $(UNITTARGETS)
 clean:
        $(RM) $(OBJS)
        $(RM) $(TARGETS) $(UNITTARGETS) convert
-       $(RM) libcupsmime.so libcupsmime.dylib
 
 
 #
@@ -241,40 +239,13 @@ install-exec:
 #
 
 install-headers:
-       if test "x$(privateinclude)" != x; then \
-               echo Installing private header files into $(PRIVATEINCLUDE)...; \
-               $(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
-               $(INSTALL_DATA) mime.h $(PRIVATEINCLUDE); \
-       fi
 
 
 #
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC)
-       echo Installing libraries in $(LIBDIR)...
-       $(INSTALL_DIR) -m 755 $(LIBDIR)
-       $(INSTALL_LIB) $(LIBCUPSMIME) $(LIBDIR)
-       if test $(LIBCUPSMIME) = "libcupsmime.so.1"; then \
-               $(RM) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
-               $(LN) $(LIBCUPSMIME) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
-       fi
-       if test $(LIBCUPSMIME) = "libcupsmime.1.dylib"; then \
-               $(RM) $(LIBDIR)/libcupsmime.dylib; \
-               $(LN) $(LIBCUPSMIME) $(LIBDIR)/libcupsmime.dylib; \
-       fi
-       if test "x$(SYMROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SYMROOT); \
-               cp $(LIBCUPSMIME) $(SYMROOT); \
-               dsymutil $(SYMROOT)/$(LIBCUPSMIME); \
-       fi
-
-installstatic:
-       $(INSTALL_DIR) -m 755 $(LIBDIR)
-       $(INSTALL_LIB) -m 755 libcupsmime.a $(LIBDIR)
-       $(RANLIB) $(LIBDIR)/libcupsmime.a
-       $(CHMOD) 555 $(LIBDIR)/libcupsmime.a
+install-libs:
 
 
 #
@@ -301,16 +272,6 @@ uninstall:
        -$(RMDIR) $(REQUESTS)
        -$(RMDIR) $(LOGDIR)
        -$(RMDIR) $(CACHEDIR)
-       $(RM) $(LIBDIR)/libcupsmime.1.dylib
-       $(RM) $(LIBDIR)/libcupsmime.a
-       $(RM) $(LIBDIR)/libcupsmime.dylib
-       $(RM) $(LIBDIR)/libcupsmime.so
-       $(RM) $(LIBDIR)/libcupsmime.so.1
-       -$(RMDIR) $(LIBDIR)
-       -if test "x$(privateinclude)" != x; then \
-               $(RM) $(PRIVATEINCLUDE)/mime.h; \
-               $(RMDIR) $(PRIVATEINCLUDE); \
-       fi
        if test "x$(INITDIR)" != x; then \
                echo Uninstalling init scripts...; \
                $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \
@@ -354,9 +315,9 @@ uninstall:
 # Make the scheduler executable, "cupsd".
 #
 
-cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cups/$(LIBCUPS)
+cupsd: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
+       $(LD_CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) libcupsmime.a \
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
                $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) \
                 $(DNSSDLIBS) $(LIBS) $(LIBGSSAPI) $(LIBWRAP)
@@ -376,9 +337,9 @@ cupsd-static:       $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 # Make the cupsfilter utility.
 #
 
-cupsfilter:    cupsfilter.o $(LIBCUPSMIME) ../cups/$(LIBCUPS)
+cupsfilter:    cupsfilter.o libcupsmime.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cupsfilter cupsfilter.o -L. -lcupsmime $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o cupsfilter cupsfilter.o libcupsmime.a $(LIBS)
        $(RM) convert
        $(LN) cupsfilter convert
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -432,45 +393,6 @@ cups-lpd:  cups-lpd.o ../cups/$(LIBCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
-#
-# libcupsmime.so.1
-#
-
-libcupsmime.so.1:      $(LIBOBJS)
-       echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
-       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-       $(RM) `basename $@ .1`
-       $(LN) $@ `basename $@ .1`
-
-
-#
-# libcupsmime.1.dylib
-#
-
-libcupsmime.1.dylib:   $(LIBOBJS) libcupsmime.exp
-       echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
-               -install_name $(libdir)/$@ \
-               -current_version 1.0.0 \
-               -compatibility_version 1.0.0 \
-               -exported_symbols_list libcupsmime.exp \
-               $(LIBOBJS) $(LIBS)
-       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-       $(RM) libcupsmime.dylib
-       $(LN) $@ libcupsmime.dylib
-
-
-#
-# libcupsmime.la
-#
-
-libcupsmime.la:    $(LIBOBJS)
-       echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-               -version-info 1:0 $(LIBS)
-
-
 #
 # libcupsmime.a
 #