projects / xscreensaver / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ftp://ftp.linux.ncsu.edu/mirror/ftp.redhat.com/pub/redhat/linux/enterprise/4/en/os...
[xscreensaver] / driver / Makefile.in
diff --git a/driver/Makefile.in b/driver/Makefile.in
index 42d9da23b2564d2330dfcc1c4039e9bdc4615161..2830471053e7c9ffa7692d9def6bf4c68f6bbc3e 100644 (file)
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -1,9 +1,9 @@
-# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-1999 Jamie Zawinski.
+# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-2004 Jamie Zawinski.
 # the `../configure' script generates `driver/Makefile' from this file.
 
 @SET_MAKE@
 .SUFFIXES:
-.SUFFIXES: .c .o
+.SUFFIXES: .c .m .o
 
 srcdir         = @srcdir@
 VPATH          = @srcdir@
@@ -36,6 +36,7 @@ GNOME_BINDIR  = $(bindir)
 HACK_CONF_DIR  = @HACK_CONF_DIR@
 
 CC             = @CC@
+OBJCC          = @OBJCC@
 CFLAGS         = @CFLAGS@
 LDFLAGS                = @LDFLAGS@
 DEFS           = @DEFS@
@@ -110,15 +111,20 @@ KERBEROS_OBJS     = passwd-kerberos.o
 PAM_SRCS       = passwd-pam.c
 PAM_OBJS       = passwd-pam.o
 
+PWHELPER_SRCS  = passwd-helper.c
+PWHELPER_OBJS  = passwd-helper.o
+
 LOCK_SRCS_1    = lock.c passwd.c
 LOCK_OBJS_1    = lock.o passwd.o
 NOLOCK_SRCS_1  = lock.c
 NOLOCK_OBJS_1  = lock.o
 
-TEST_SRCS      = test-passwd.c test-uid.c test-xdpms.c test-grab.c \
-                 test-apm.c test-fade.c test-xinerama.c xdpyinfo.c
-TEST_EXES      = test-passwd   test-uid   test-xdpms   test-grab \
-                 test-apm   test-fade   test-xinerama   xdpyinfo
+TEST_SRCS      = test-passwd.c test-uid.c  test-xdpms.c    test-grab.c \
+                 test-apm.c    test-fade.c test-xinerama.c test-vp.c   \
+                 test-randr.c  xdpyinfo.c
+TEST_EXES      = test-passwd   test-uid    test-xdpms      test-grab   \
+                 test-apm      test-fade   test-xinerama   test-vp     \
+                 test-randr    xdpyinfo
 
 MOTIF_LIBS     = @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
 GTK_LIBS       = @GTK_LIBS@ $(XMU_LIBS)
@@ -192,6 +198,10 @@ DEMO_OBJS_1        = prefs.o dpms.o $(XMU_OBJS)
 DEMO_SRCS      = prefs.c dpms.c remote.c exec.c $(DEMO_UTIL_SRCS)
 DEMO_OBJS      = prefs.o dpms.o remote.o exec.o $(DEMO_UTIL_OBJS)
 
+PDF2JPEG_SRCS  = pdf2jpeg.m
+PDF2JPEG_OBJS  = pdf2jpeg.o
+PDF2JPEG_LIBS  = -framework Cocoa
+
 SAVER_LIBS     = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
                  $(XDPMS_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
                  -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
@@ -204,18 +214,25 @@ GETIMG_LIBS       = $(LIBS) $(X_LIBS) $(XPM_LIBS) $(JPEG_LIBS) \
                  $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS)
 
 EXES           = xscreensaver xscreensaver-command xscreensaver-demo \
-                 xscreensaver-getimage
+                 xscreensaver-getimage @EXES_OSX@
 EXES2          = @ALL_DEMO_PROGRAMS@
-SCRIPTS                = xscreensaver-getimage-file xscreensaver-getimage-video
+EXES_OSX       = pdf2jpeg
+
+SCRIPTS_1      = xscreensaver-getimage-file xscreensaver-getimage-video
+SCRIPTS_OSX    = xscreensaver-getimage-desktop
+SCRIPTS                = $(SCRIPTS_1) @SCRIPTS_OSX@
 
 HDRS           = XScreenSaver_ad.h xscreensaver.h prefs.h remote.h \
                  demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
                  demo-Gtk-conf.h
-MEN            = xscreensaver.man xscreensaver-demo.man \
+MEN_1          = xscreensaver.man xscreensaver-demo.man \
                  xscreensaver-command.man \
                  xscreensaver-getimage.man \
                  xscreensaver-getimage-file.man \
                  xscreensaver-getimage-video.man
+MEN_OSX                = xscreensaver-getimage-desktop.man pdf2jpeg.man
+MEN            = $(MEN_1) @MEN_OSX@
+
 EXTRAS         = README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
                  xscreensaver-demo.glade xscreensaver-demo.glade2 \
                  xscreensaver-demo.glade2p \
@@ -228,10 +245,11 @@ VMSFILES  = compile_axp.com compile_decc.com link_axp.com link_decc.com \
                  vms_axp.opt vms_axp_12.opt vms_decc.opt vms_decc_12.opt
 
 TARFILES       = $(EXTRAS) $(VMSFILES) $(SAVER_SRCS_1) \
-                 $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) \
+                 $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) $(PWHELPER_SRCS) \
                  $(KERBEROS_SRCS) $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) \
-                 $(CMD_SRCS) $(GETIMG_SRCS_1) $(HDRS) $(SCRIPTS) \
-                 $(TEST_SRCS) $(MEN)
+                 $(CMD_SRCS) $(GETIMG_SRCS_1) $(PDF2JPEG_SRCS) $(HDRS) \
+                 $(SCRIPTS_1) $(SCRIPTS_OSX) $(MEN_1) $(MEN_OSX) \
+                 $(TEST_SRCS)
 
 
 default: $(EXES)
@@ -274,18 +292,11 @@ install-program: $(EXES)
        fi ;                                                                  \
        echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ;    \
        $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
-       @echo $(INSTALL_PROGRAM) xscreensaver-command \
-         $(install_prefix)$(bindir)/xscreensaver-command ; \
-       $(INSTALL_PROGRAM) xscreensaver-command \
-         $(install_prefix)$(bindir)/xscreensaver-command
-       @echo $(INSTALL_PROGRAM) xscreensaver-demo \
-         $(install_prefix)$(bindir)/xscreensaver-demo ; \
-       $(INSTALL_PROGRAM) xscreensaver-demo \
-         $(install_prefix)$(bindir)/xscreensaver-demo
-       @echo $(INSTALL_PROGRAM) xscreensaver-getimage \
-         $(install_prefix)$(bindir)/xscreensaver-getimage ; \
-       $(INSTALL_PROGRAM) xscreensaver-getimage \
-         $(install_prefix)$(bindir)/xscreensaver-getimage
+       @for exe in xscreensaver-command xscreensaver-demo                 \
+                   xscreensaver-getimage @EXES_OSX@ ; do                  \
+         echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
+              $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
+        done
 
 install-ad: XScreenSaver.ad
        @if [ ! -d $(install_prefix)$(AD_DIR) ]; then                         \
@@ -831,7 +842,10 @@ $(SAVER_UTIL_OBJS):
 
 # How we build object files in this directory.
 .c.o:
-       $(CC) -c $(INCLUDES) $(DEFS)  $(CFLAGS) $(X_CFLAGS) $<
+       $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
+
+.m.o:
+       $(OBJCC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
 
 # subprocs takes an extra -D option.
 subprocs.o: subprocs.c
@@ -883,12 +897,15 @@ xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS)
 
 xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) $(LIBS) $(X_LIBS) \
-       $(GTK_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \
-       $(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS)
+       $(GTK_LIBS) $(XPM_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) \
+       -lXt -lX11 $(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS)
 
 xscreensaver-getimage: $(GETIMG_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm
 
+pdf2jpeg: $(PDF2JPEG_OBJS)
+       $(OBJCC) $(LDFLAGS) -o $@ $(PDF2JPEG_OBJS) $(PDF2JPEG_LIBS) -lm
+
 
 TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \
         subprocs.o setuid.o splash.o prefs.o \
@@ -909,6 +926,14 @@ test-xinerama: test-xinerama.o
        $(CC) $(LDFLAGS) -o $@ test-xinerama.o $(LIBS) $(X_LIBS) $(SAVER_LIBS)\
        $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
 
+test-vp: test-vp.o
+       $(CC) $(LDFLAGS) -o $@ test-vp.o $(LIBS) $(X_LIBS) $(SAVER_LIBS) \
+       $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
+
+test-randr: test-randr.o
+       $(CC) $(LDFLAGS) -o $@ test-randr.o $(LIBS) $(X_LIBS) $(SAVER_LIBS) \
+       $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
+
 test-grab: test-grab.o
        $(CC) $(LDFLAGS) -o $@ test-grab.o $(SAVER_LIBS)
 
@@ -985,7 +1010,9 @@ test-passwd.o: ../config.h
 test-passwd.o: $(srcdir)/prefs.h
 test-passwd.o: XScreenSaver_ad.h
 test-passwd.o: $(srcdir)/xscreensaver.h
+test-randr.o: ../config.h
 test-uid.o: ../config.h
+test-vp.o: ../config.h
 test-xdpms.o: ../config.h
 test-xinerama.o: ../config.h
 timers.o: ../config.h
Archive of old xscreensaver versions (http://www.jwz.org/xscreensaver/)