Skip to content

Commit 22db8e7

Browse files
stspstsp
committed
move djdev64 away
1 parent c87fd58 commit 22db8e7

36 files changed

Lines changed: 9 additions & 2915 deletions

‎configure.ac‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ AC_CONFIG_FILES([
66
Makefile.conf
77
dj64.pc
88
dj64_s.pc
9-
djdev64.pc
10-
djstub64.pc
119
dj32.pc
1210
])
1311

‎debian/control‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Build-Depends:
1111
autoconf,
1212
automake,
1313
pkgconf,
14-
libelf-dev,
14+
djdev64-dev,
1515
ncurses-bin,
1616
debhelper (>= 9~)
17-
Homepage: https://github.com/stsp/djgpp-cvs
17+
Homepage: https://github.com/stsp/dj64dev
1818
Description: 64-bit djgpp-compatible dev suite
1919
dj64dev is a 64-bit djgpp-compatible dev suite.
2020

@@ -52,27 +52,3 @@ Depends: ${misc:Depends},
5252
Description: development tools and headers of dj32
5353
This package contains tools and headers for building dj64-enabled programs
5454
for 32bit targets.
55-
56-
Package: libdjdev64-0
57-
Replaces: djdev64
58-
Architecture: any
59-
Depends: ${misc:Depends}, ${shlibs:Depends}
60-
Description: djdev64 runtime libraries
61-
This package contains runtime libraries for djdev64-enabled DPMI host.
62-
63-
Package: libdjstub64-0
64-
Replaces: djdev64
65-
Architecture: any
66-
Depends: ${misc:Depends}, ${shlibs:Depends}
67-
Description: djdev64 runtime libraries
68-
This package contains runtime libraries for djdev64-enabled DPMI host.
69-
70-
Package: djdev64-dev
71-
Architecture: any
72-
Section: libdevel
73-
Depends: libdjdev64-0 (= ${binary:Version}),
74-
libdjstub64-0 (= ${binary:Version}),
75-
${misc:Depends}
76-
Description: djdev64 development libraries and headers
77-
This package contains development libraries and headers for
78-
djdev64-enabled DPMI host.

‎debian/djdev64-dev.install‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎dj64dev.spec.rpkg‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ BuildRequires: gcc
2222
BuildRequires: binutils
2323
BuildRequires: gcc-x86_64-linux-gnu
2424
BuildRequires: binutils-x86_64-linux-gnu
25-
BuildRequires: elfutils-libelf-devel
25+
BuildRequires: djdev64-devel
2626
BuildRequires: thunk-gen
2727
BuildRequires: pkgconf-pkg-config
2828
BuildRequires: ctags
@@ -133,35 +133,6 @@ for 32bit targets.
133133
%{_libdir}/pkgconfig/dj32.pc
134134
%end
135135

136-
%package djdev64
137-
Summary: djdev64 runtime libraries
138-
139-
%description djdev64
140-
This package contains runtime libraries for djdev64-enabled DPMI host.
141-
%end
142-
143-
%files djdev64
144-
%defattr(-,root,root)
145-
%{_libdir}/*.so.*
146-
%end
147-
148-
%package djdev64-devel
149-
Summary: djdev64 development libraries and headers
150-
Requires: dj64dev-djdev64 = {{{ git_dir_version }}}
151-
152-
%description djdev64-devel
153-
This package contains development libraries and headers for
154-
djdev64-enabled DPMI host.
155-
%end
156-
157-
%files djdev64-devel
158-
%defattr(-,root,root)
159-
%{_includedir}/djdev64
160-
%{_libdir}/*.so
161-
%{_libdir}/pkgconfig/djdev64.pc
162-
%{_libdir}/pkgconfig/djstub64.pc
163-
%end
164-
165136
%changelog
166137
{{{ git_dir_changelog }}}
167138
%end

‎djdev64.pc.in‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎djstub64.pc.in‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎makefile‎

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,13 @@ DJ64LIBV = $(TOP)/lib/libdj64.*.*
2626
DJ64DEVL = $(TOP)/lib/libdj64.$(SHLIB_EXT)
2727
DJ64LIBS = $(TOP)/lib/libdj64_s.a
2828
DJ32LIBS = $(TOP)/lib/libdj32_s.a
29-
DJDEV64LIB = $(TOP)/lib/libdjdev64.*.*.*
30-
DJDEV64LIBV = $(TOP)/lib/libdjdev64.*.*
31-
DJDEV64DEVL = $(TOP)/lib/libdjdev64.$(SHLIB_EXT)
32-
DJSTUB64LIB = $(TOP)/lib/libdjstub64.*.*.*
33-
DJSTUB64LIBV = $(TOP)/lib/libdjstub64.*.*
34-
DJSTUB64DEVL = $(TOP)/lib/libdjstub64.$(SHLIB_EXT)
3529
DJELFLOAD = $(TOP)/lib/elfload.com
3630
NC_BUILD = contrib/ncurses/build
3731
NC_BUILD32 = contrib/ncurses/build32
3832

39-
.PHONY: dj64 djdev64 demos ncurses ncurses32
33+
.PHONY: dj64 demos ncurses ncurses32
4034

41-
all: Makefile.conf dj64 djdev64 ncurses ncurses32
35+
all: Makefile.conf dj64 ncurses ncurses32
4236
@echo
4337
@echo "Done building. You may need to run \"sudo make install\" now."
4438
@echo "You can first run \"sudo make uninstall\" to purge the prev install."
@@ -63,9 +57,6 @@ endif
6357
%.pc: %.pc.in config.status
6458
./config.status
6559

66-
djdev64: djdev64.pc djstub64.pc
67-
$(MAKE) -C src/djdev64
68-
6960
ifeq ($(USE64),1)
7061
DJ64PC = dj64.pc dj64_s.pc
7162
endif
@@ -104,23 +95,8 @@ ifeq ($(NCURSES),1)
10495
endif
10596
endif
10697

107-
install_djdev64:
108-
$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
109-
$(INSTALL) -m 0644 djdev64.pc $(DESTDIR)$(libdir)/pkgconfig
110-
$(INSTALL) -m 0644 djstub64.pc $(DESTDIR)$(libdir)/pkgconfig
111-
$(INSTALL) -d $(DESTDIR)$(includedir)/djdev64
112-
cp -rL $(abs_top_srcdir)/src/djdev64/include/djdev64 $(DESTDIR)$(includedir)
113-
$(INSTALL) -d $(DESTDIR)$(libdir)
114-
$(INSTALL) -m 0755 $(DJDEV64LIB) $(DESTDIR)$(libdir)
115-
$(CP_FP) $(DJDEV64LIBV) $(DESTDIR)$(libdir)
116-
$(CP_FP) $(DJDEV64DEVL) $(DESTDIR)$(libdir)
117-
$(INSTALL) -m 0755 $(DJSTUB64LIB) $(DESTDIR)$(libdir)
118-
$(CP_FP) $(DJSTUB64LIBV) $(DESTDIR)$(libdir)
119-
$(CP_FP) $(DJSTUB64DEVL) $(DESTDIR)$(libdir)
120-
121-
install: install_dj64 install_djdev64 install_demos install32
98+
install: install_dj64 install_demos install32
12299
@echo
123-
@echo "Done installing. You may need to run \"sudo ldconfig\" now."
124100

125101
uninstall64:
126102
ifeq ($(USE64),1)
@@ -131,23 +107,11 @@ endif
131107
endif
132108
$(RM) -r $(DESTDIR)$(datadir)/dj64
133109
$(RM) -r $(DESTDIR)$(sysroot)
134-
$(RM) -r $(DESTDIR)$(includedir)/djdev64
135110
$(RM) $(DESTDIR)$(libdir)/pkgconfig/dj64.pc
136111
$(RM) $(DESTDIR)$(libdir)/pkgconfig/dj64_s.pc
137112
$(MAKE) -C demos src_uninstall
138113
endif
139114

140-
uninstall_dev64:
141-
$(RM) $(DESTDIR)$(libdir)/pkgconfig/djdev64.pc
142-
$(RM) $(DESTDIR)$(libdir)/pkgconfig/djstub64.pc
143-
$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJDEV64DEVL))
144-
$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJDEV64LIBV))
145-
$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJDEV64LIB))
146-
$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJSTUB64DEVL))
147-
$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJSTUB64LIBV))
148-
$(RM) $(DESTDIR)$(libdir)/$(notdir $(DJSTUB64LIB))
149-
ldconfig
150-
151115
install32:
152116
ifeq ($(USE32),1)
153117
$(INSTALL) -d $(DESTDIR)$(sysroot32)/lib
@@ -176,11 +140,10 @@ endif
176140
$(RM) $(DESTDIR)$(libdir)/pkgconfig/dj32.pc
177141
endif
178142

179-
uninstall: uninstall64 uninstall_dev64 uninstall32
143+
uninstall: uninstall64 uninstall32
180144

181145
clean: demos_clean
182146
$(MAKE) -C src clean
183-
$(MAKE) -C src/djdev64 clean
184147
$(RM) *.pc
185148
$(RM) -r lib
186149
ifeq ($(NCURSES),1)

0 commit comments

Comments
 (0)