|
Line
Link Here
|
| 0 |
-- qingy-1.0.0.orig/configure.in |
0 |
++ qingy-1.0.0/configure.in |
|
Lines 11-16
AC_PROG_CC
Link Here
|
| 11 |
AM_PROG_LEX |
11 |
AM_PROG_LEX |
| 12 |
AC_PROG_YACC |
12 |
AC_PROG_YACC |
| 13 |
AM_PATH_LISPDIR |
13 |
AM_PATH_LISPDIR |
|
|
14 |
AC_CONFIG_MACRO_DIR([m4]) |
| 14 |
|
15 |
|
| 15 |
# GCC optimizations |
16 |
# GCC optimizations |
| 16 |
AC_ARG_ENABLE(optimizations, AC_HELP_STRING([--enable-optimizations], |
17 |
AC_ARG_ENABLE(optimizations, AC_HELP_STRING([--enable-optimizations], |
| 17 |
-- qingy-1.0.0.orig/Makefile.am |
18 |
++ qingy-1.0.0/Makefile.am |
|
Lines 1-5
Link Here
|
| 1 |
SUBDIRS = src media doc |
1 |
SUBDIRS = src media doc |
| 2 |
|
2 |
|
|
|
3 |
ACLOCAL_AMFLAGS = -I m4 |
| 4 |
|
| 3 |
EXTRA_DIST = \ |
5 |
EXTRA_DIST = \ |
| 4 |
AUTHORS \ |
6 |
AUTHORS \ |
| 5 |
COPYING \ |
7 |
COPYING \ |
| 6 |
-- qingy-1.0.0.orig/media/screensavers/photos/Makefile.am |
8 |
++ qingy-1.0.0/media/screensavers/photos/Makefile.am |
|
Lines 1-23
Link Here
|
| 1 |
screensaverdir = @SCREENSAVERS_DIR@ |
1 |
screensaverdir = @SCREENSAVERS_DIR@ |
| 2 |
|
2 |
|
| 3 |
if WANT_SCREEN_SAVERS |
3 |
if WANT_SCREEN_SAVERS |
| 4 |
screensaver_PROGRAMS = photos.qss |
4 |
screensaver_LTLIBRARIES = photos.la |
| 5 |
else |
5 |
else |
| 6 |
screensaver_PROGRAMS = |
6 |
screensaver_LTLIBRARIES = |
| 7 |
endif |
7 |
endif |
| 8 |
|
8 |
|
| 9 |
photos_qss_SOURCES = \ |
9 |
photos_la_SOURCES = \ |
| 10 |
photos.c \ |
10 |
photos.c \ |
| 11 |
wildcards.c \ |
11 |
wildcards.c \ |
| 12 |
wildcards.h |
12 |
wildcards.h |
| 13 |
|
13 |
|
| 14 |
INCLUDES = -I../../.. -I../../../src/DirectFB/objects/ -I../../../src/ -I../../../src/libraries/ |
14 |
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/DirectFB/objects/ -I$(top_srcdir)/src/ -I$(top_srcdir)/src/libraries/ |
| 15 |
AM_CFLAGS = @DIRECTFB_CFLAGS@ -fpic -shared |
15 |
AM_CFLAGS = @DIRECTFB_CFLAGS@ |
|
|
16 |
AM_LDFLAGS = -module -shared -avoid-version -shrext .qss |
| 16 |
|
17 |
|
| 17 |
if !WANT_STATIC |
18 |
if !WANT_STATIC |
| 18 |
photos_qss_LDADD = ../../../src/libraries/libqingy.la |
19 |
photos_la_LIBADD = ../../../src/libraries/libqingy.la |
| 19 |
photos_qss_LDFLAGS = -rdynamic |
|
|
| 20 |
else |
20 |
else |
| 21 |
photos_qss_LDADD = ../../../src/libraries/libqingy_static.la |
21 |
photos_la_LIBADD = ../../../src/libraries/libqingy_static.la |
| 22 |
photos_qss_LDFLAGS = -static |
|
|
| 23 |
endif |
22 |
endif |
| 24 |
-- qingy-1.0.0.orig/media/screensavers/pixel/Makefile.am |
23 |
++ qingy-1.0.0/media/screensavers/pixel/Makefile.am |
|
Lines 1-12
Link Here
|
| 1 |
screensaverdir = @SCREENSAVERS_DIR@ |
1 |
screensaverdir = @SCREENSAVERS_DIR@ |
| 2 |
|
2 |
|
| 3 |
if WANT_SCREEN_SAVERS |
3 |
if WANT_SCREEN_SAVERS |
| 4 |
screensaver_PROGRAMS = pixel.qss |
4 |
screensaver_LTLIBRARIES = pixel.la |
| 5 |
else |
5 |
else |
| 6 |
screensaver_PROGRAMS = |
6 |
screensaver_LTLIBRARIES = |
| 7 |
endif |
7 |
endif |
| 8 |
|
8 |
|
| 9 |
pixel_qss_SOURCES = pixel.c |
9 |
pixel_la_SOURCES = pixel.c |
| 10 |
|
10 |
|
| 11 |
INCLUDES = -I../../.. -I../../../src/DirectFB/objects/ |
11 |
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/DirectFB/objects/ |
| 12 |
AM_CFLAGS = @DIRECTFB_CFLAGS@ -fpic -shared |
12 |
AM_CFLAGS = @DIRECTFB_CFLAGS@ |
|
|
13 |
AM_LDFLAGS = -module -shared -avoid-version -shrext .qss |
| 13 |
-- qingy-1.0.0.orig/media/screensavers/running_time/Makefile.am |
14 |
++ qingy-1.0.0/media/screensavers/running_time/Makefile.am |
|
Lines 1-12
Link Here
|
| 1 |
screensaverdir = @SCREENSAVERS_DIR@ |
1 |
screensaverdir = @SCREENSAVERS_DIR@ |
| 2 |
|
2 |
|
| 3 |
if WANT_SCREEN_SAVERS |
3 |
if WANT_SCREEN_SAVERS |
| 4 |
screensaver_PROGRAMS = running_time.qss |
4 |
screensaver_LTLIBRARIES = running_time.la |
| 5 |
else |
5 |
else |
| 6 |
screensaver_PROGRAMS = |
6 |
screensaver_LTLIBRARIES = |
| 7 |
endif |
7 |
endif |
| 8 |
|
8 |
|
| 9 |
running_time_qss_SOURCES = running_time.c |
9 |
running_time_la_SOURCES = running_time.c |
| 10 |
|
10 |
|
| 11 |
INCLUDES = -I../../.. -I../../../src/DirectFB/objects/ |
11 |
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/DirectFB/objects/ |
| 12 |
AM_CFLAGS = @DIRECTFB_CFLAGS@ -fpic -shared |
12 |
AM_CFLAGS = @DIRECTFB_CFLAGS@ |
|
|
13 |
AM_LDFLAGS = -module -shared -avoid-version -shrext .qss |
| 13 |
-- qingy-1.0.0.orig/src/DirectFB/Makefile.am |
14 |
++ qingy-1.0.0/src/DirectFB/Makefile.am |
|
Lines 1-6
Link Here
|
| 1 |
## Makefile.am for qingy/src/DirectFB |
1 |
## Makefile.am for qingy/src/DirectFB |
| 2 |
|
2 |
|
| 3 |
INCLUDES = -I../.. -Iobjects -I../ -I../libraries |
3 |
INCLUDES = -I$(top_srcdir) -I$(srcdir)/objects -I$(srcdir)/.. -I$(srcdir)/../libraries |
| 4 |
AM_CFLAGS = @DIRECTFB_CFLAGS@ |
4 |
AM_CFLAGS = @DIRECTFB_CFLAGS@ |
| 5 |
|
5 |
|
| 6 |
sbin_PROGRAMS = qingy-DirectFB |
6 |
sbin_PROGRAMS = qingy-DirectFB |
|
Lines 17-23
qingy_DirectFB_SOURCES =
Link Here
|
| 17 |
|
17 |
|
| 18 |
if !WANT_STATIC |
18 |
if !WANT_STATIC |
| 19 |
qingy_DirectFB_LDADD = ../libraries/libqingy.la @DIRECTFB_LIBS@ |
19 |
qingy_DirectFB_LDADD = ../libraries/libqingy.la @DIRECTFB_LIBS@ |
| 20 |
qingy_DirectFB_LDFLAGS = -rdynamic |
20 |
qingy_DirectFB_LDFLAGS = -export-dynamic |
| 21 |
else |
21 |
else |
| 22 |
qingy_DirectFB_LDADD = ../libraries/libqingy_static.la @DIRECTFB_LIBS@ |
22 |
qingy_DirectFB_LDADD = ../libraries/libqingy_static.la @DIRECTFB_LIBS@ |
| 23 |
qingy_DirectFB_LDFLAGS = -static |
23 |
qingy_DirectFB_LDFLAGS = -static |
| 24 |
-- qingy-1.0.0.orig/src/libraries/Makefile.am |
24 |
++ qingy-1.0.0/src/libraries/Makefile.am |
|
Lines 1-7
Link Here
|
| 1 |
## Makefile.am for qingy/src/libraries |
1 |
## Makefile.am for qingy/src/libraries |
| 2 |
|
2 |
|
| 3 |
AM_YFLAGS = -d |
3 |
AM_YFLAGS = -d |
| 4 |
INCLUDES = -I../.. -I../ |
4 |
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src |
| 5 |
BUILT_SOURCES = parse_settings.h |
5 |
BUILT_SOURCES = parse_settings.h |
| 6 |
|
6 |
|
| 7 |
AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DSBINDIR=\"$(sbindir)/\" |
7 |
AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DSBINDIR=\"$(sbindir)/\" |
| 8 |
-- qingy-1.0.0.orig/src/Makefile.am |
8 |
++ qingy-1.0.0/src/Makefile.am |
|
Lines 3-13
Link Here
|
| 3 |
DIST_SUBDIRS = libraries DirectFB |
3 |
DIST_SUBDIRS = libraries DirectFB |
| 4 |
SUBDIRS = libraries |
4 |
SUBDIRS = libraries |
| 5 |
|
5 |
|
| 6 |
INCLUDES = -I.. -Ilibraries |
6 |
INCLUDES = -I$(top_srcdir) -I$(srcdir)/libraries |
| 7 |
|
7 |
|
| 8 |
if USE_DIRECTFB |
8 |
if USE_DIRECTFB |
| 9 |
SUBDIRS += DirectFB |
9 |
SUBDIRS += DirectFB |
| 10 |
INCLUDES += -IDirectFB |
10 |
INCLUDES += -I$(srcdir)/DirectFB |
| 11 |
endif |
11 |
endif |
| 12 |
|
12 |
|
| 13 |
sbin_PROGRAMS = qingy qingy-reset-console |
13 |
sbin_PROGRAMS = qingy qingy-reset-console |
|
Lines 21-29
qingy_reset_console_SOURCES = \
Link Here
|
| 21 |
|
21 |
|
| 22 |
if !WANT_STATIC |
22 |
if !WANT_STATIC |
| 23 |
qingy_LDADD = libraries/libqingy.la |
23 |
qingy_LDADD = libraries/libqingy.la |
| 24 |
qingy_LDFLAGS = -rdynamic |
24 |
qingy_LDFLAGS = -export-dynamic |
| 25 |
qingy_reset_console_LDADD = libraries/libqingy.la |
25 |
qingy_reset_console_LDADD = libraries/libqingy.la |
| 26 |
qingy_reset_console_LDFLAGS = -rdynamic |
26 |
qingy_reset_console_LDFLAGS = -export-dynamic |
| 27 |
else |
27 |
else |
| 28 |
qingy_LDADD = libraries/libqingy_static.la |
28 |
qingy_LDADD = libraries/libqingy_static.la |
| 29 |
qingy_LDFLAGS = -static |
29 |
qingy_LDFLAGS = -static |
|
Lines 46-52
sbin_PROGRAMS += qingy-keygen
Link Here
|
| 46 |
|
46 |
|
| 47 |
if !WANT_STATIC |
47 |
if !WANT_STATIC |
| 48 |
qingy_keygen_LDADD = libraries/libqingy.la |
48 |
qingy_keygen_LDADD = libraries/libqingy.la |
| 49 |
qingy_keygen_LDFLAGS = -rdynamic |
49 |
qingy_keygen_LDFLAGS = -export-dynamic |
| 50 |
else |
50 |
else |
| 51 |
qingy_keygen_LDADD = libraries/libqingy_static.la |
51 |
qingy_keygen_LDADD = libraries/libqingy_static.la |
| 52 |
qingy_keygen_LDFLAGS = -static |
52 |
qingy_keygen_LDFLAGS = -static |
