/[gentoo-x86]/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff
Gentoo

Contents of /dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.3 - (show annotations) (download)
Sat Jul 7 14:32:07 2012 UTC (2 years, 5 months ago) by hattya
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +15 -3 lines
File MIME type: text/plain
update configure.ac.

(Portage version: 2.1.10.65/cvs/Linux i686)

1 --- Gauche-qdbm-0.2.orig/Makefile.in
2 +++ Gauche-qdbm-0.2/Makefile.in
3 @@ -10,79 +10,57 @@
4 VPATH = $(srcdir)
5
6 # These may be overridden by make invocators
7 -DESTDIR =
8 -OPTFLAGS = @OPTFLAGS@
9 -CC = @CC@
10 -LIBS = @LIBS@
11 -CFLAGS = @CFLAGS@
12 -CPPFLAGS = @CPPFLAGS@ # AC_LIB_LINKFLAGS adds to this..
13 -LDFLAGS = @LDFLAGS@
14 -INSTALL = @INSTALL@
15 -INSTALL_TYPE = @INSTALL_TYPE@
16 -
17 -# Set by configure
18 -GOSH = @GOSH@
19 -GAUCHE_CONFIG = @GAUCHE_CONFIG@
20 +DESTDIR =
21 +CPPFLAGS = @CPPFLAGS@ # AC_LIB_LINKFLAGS adds to this..
22 +GOSH = "@GOSH@"
23 +GAUCHE_CONFIG = "@GAUCHE_CONFIG@"
24 +GAUCHE_PACKAGE = "@GAUCHE_PACKAGE@"
25 +INSTALL = "@GAUCHE_INSTALL@"
26 +
27 +# Other parameters
28 +SOEXT = @SOEXT@
29 OBJEXT = @OBJEXT@
30 -DSOEXT = @SOEXT@
31 +EXEEXT = @EXEEXT@
32
33 -MODULE = qdbm
34 +# Module-specific stuff
35 +PACKAGE = qdbm
36
37 -ARCHFILES = $(MODULE).$(DSOEXT)
38 -SCMFILES = $(MODULE).scm
39 +ARCHFILES = $(PACKAGE).$(SOEXT)
40 +SCMFILES = $(PACKAGE).scm
41 HEADERS =
42
43 TARGET = $(ARCHFILES)
44 -OBJS = $(MODULE)_head.$(OBJEXT) \
45 - qdbm.$(OBJEXT) \
46 - depot.$(OBJEXT) \
47 - $(MODULE)_tail.$(OBJEXT)
48 -GENERATED = depot.c $(MODULE)_head.c $(MODULE)_tail.c
49 +GENERATED =
50 CONFIG_GENERATED = Makefile config.cache config.log config.status \
51 - configure.lineno autom4te*.cache
52 -
53 -HEADER_INSTALL_DIR = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)incdir`
54 -SCM_INSTALL_DIR = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)libdir`/dbm
55 -ARCH_INSTALL_DIR = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)archdir`
56 -
57 -all : $(TARGET)
58 + configure.lineno autom4te*.cache @PACKAGE_NAME@.gpd
59
60 -.SUFFIXES: .o .stub
61 +HEADER_INSTALL_DIR = "$(DESTDIR)`$(GAUCHE_CONFIG) --siteincdir`"
62 +SCM_INSTALL_DIR = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitelibdir`"
63 +ARCH_INSTALL_DIR = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitearchdir`"
64
65 -.c.o:
66 - $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
67 +qdbm_SRCS = qdbm.c depot.stub
68 +qdbm_LIBS = @LIBQDBM@
69
70 -.stub.c:
71 - $(GOSH) genstub $<
72 -
73 -depot.c : depot.stub
74 -
75 -$(MODULE).$(DSOEXT): $(OBJS)
76 - $(CC) -Wl,-rpath -Wl,`gauche-config --sysarchdir` $(LDFLAGS) $(MODULE).$(DSOEXT) $(OBJS) $(LIBS) @LIBQDBM@
77 +all : $(TARGET)
78
79 -$(MODULE)_head.c $(MODULE)_tail.c :
80 - $(GAUCHE_CONFIG) --fixup-extension $(MODULE)
81 +$(PACKAGE).$(SOEXT): $(qdbm_SRCS)
82 + $(GAUCHE_PACKAGE) compile --verbose \
83 + --libs="$(qdbm_LIBS)" --cppflags="$(CPPFLAGS)" \
84 + $(PACKAGE) $(qdbm_SRCS)
85
86 check : all
87 @rm -f test.log
88 $(GOSH) -I. test.scm > test.log
89
90 install : all
91 - if test ! -z "$(HEADERS)"; then \
92 - $(INSTALL) -d $(HEADER_INSTALL_DIR); \
93 - $(INSTALL) -m 444 $(HEADERS) $(HEADER_INSTALL_DIR); \
94 - fi
95 - if test ! -z "$(SCMFILES)"; then \
96 - $(INSTALL) -d $(SCM_INSTALL_DIR); \
97 - $(INSTALL) -m 444 $(SCMFILES) $(SCM_INSTALL_DIR); \
98 - fi
99 - if test ! -z "$(ARCHFILES)"; then \
100 - $(INSTALL) -d $(ARCH_INSTALL_DIR); \
101 - $(INSTALL) -m 555 $(ARCHFILES) $(ARCH_INSTALL_DIR); \
102 - fi
103 + $(INSTALL) -m 444 -T $(HEADER_INSTALL_DIR) $(HEADERS)
104 + $(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/dbm $(SCMFILES)
105 + $(INSTALL) -m 555 -T $(ARCH_INSTALL_DIR) $(ARCHFILES)
106 + $(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/.packages @PACKAGE_NAME@.gpd
107
108 clean :
109 - rm -rf core $(TARGET) $(OBJS) $(GENERATED) *~ test.log so_locations
110 + $(GAUCHE_PACKAGE) compile --clean $(PACKAGE) $(qdbm_SRCS)
111 + rm -rf core $(TARGET) $(GENERATED) *~ test.log so_locations
112
113 distclean : clean
114 rm -rf $(CONFIG_GENERATED)
115 --- Gauche-qdbm-0.2.orig/configure.ac
116 +++ Gauche-qdbm-0.2/configure.ac
117 @@ -4,18 +4,11 @@
118 AC_INIT(Gauche-qdbm, 0.2)
119 AC_CONFIG_SRCDIR(qdbm.c)
120
121 -AC_CANONICAL_SYSTEM
122 -
123 AC_GAUCHE_INIT_EXT
124 -AC_GAUCHE_INSTALL_TYPE(site)
125 AC_GAUCHE_CC
126 -AC_GAUCHE_FLAGS
127 -
128 -AC_PROG_INSTALL
129
130 AC_LIB_LINKFLAGS(qdbm)
131
132 -AC_GAUCHE_FIX_LIBS
133 -
134 +AC_GAUCHE_MAKE_GPD
135 echo $PACKAGE_VERSION > VERSION
136 AC_OUTPUT(Makefile)

  ViewVC Help
Powered by ViewVC 1.1.20