Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
clim-tos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alastair Bridgewater
clim-tos
Commits
756abfad
Commit
756abfad
authored
21 years ago
by
layer
Browse files
Options
Downloads
Patches
Plain Diff
join from acl62 to trunk on 7/3/03
parent
514f417e
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
ChangeLog.n
+16
-0
16 additions, 0 deletions
ChangeLog.n
Makefile.cobjs
+2
-2
2 additions, 2 deletions
Makefile.cobjs
Makefile.linux
+2
-1
2 additions, 1 deletion
Makefile.linux
Makefile.wnn
+14
-2
14 additions, 2 deletions
Makefile.wnn
with
34 additions
and
5 deletions
ChangeLog.n
+
16
−
0
View file @
756abfad
...
@@ -10,6 +10,11 @@ If there are user-visible changes in this commit, then list the
...
@@ -10,6 +10,11 @@ If there are user-visible changes in this commit, then list the
<standard changelog date stamp>
<standard changelog date stamp>
* <changes go here...>
* <changes go here...>
*******************************************************************************
join from acl62 to trunk on 7/3/03
command:
join.sh acl62 acl62_to_trunk_merge3 acl62_to_trunk_merge_070303 clim2
*******************************************************************************
*******************************************************************************
2.3.20
2.3.20
...
@@ -55,6 +60,17 @@ join from acl62 to trunk on 7/9/02
...
@@ -55,6 +60,17 @@ join from acl62 to trunk on 7/9/02
*******************************************************************************
*******************************************************************************
<no version change>
<no version change>
2003-05-29 Kevin Layer <layer@crikey>
* Makefile.wnn: so it compiles on RH 9
2003-04-30 Kevin Layer <layer@crikey>
for bug12007:
* Makefile.cobjs,
* Makefile.linux,
* Makefile.wnn: add -lpthread on linux
2003-01-13 Kevin Layer <layer@crikey>
2003-01-13 Kevin Layer <layer@crikey>
* Makefile.macosx: work in progress
* Makefile.macosx: work in progress
...
...
This diff is collapsed.
Click to expand it.
Makefile.cobjs
+
2
−
2
View file @
756abfad
# $
Header: /repo/cvs.copy/clim2/
Makefile.cobjs,v 1.2
0
200
2
/07/0
9
2
0:57:14
layer Exp $
# $
Id:
Makefile.cobjs,v 1.2
1
200
3
/07/0
3
2
1:04:26
layer Exp $
#
#
# Makefile.cobj for CLIM 2.0
# Makefile.cobj for CLIM 2.0
#
#
...
@@ -53,7 +53,7 @@ xlibsupport.o : xlib/xlibsupport.c
...
@@ -53,7 +53,7 @@ xlibsupport.o : xlib/xlibsupport.c
climxm.$(SHARED_EXT)
:
xlibsupport.o xtsupport.o xmsupport.o $(IMPORTS)
climxm.$(SHARED_EXT)
:
xlibsupport.o xtsupport.o xmsupport.o $(IMPORTS)
(
eval
'
$(
SET_LIBRARY_PATH
)
'
;
\
(
eval
'
$(
SET_LIBRARY_PATH
)
'
;
\
$(
MAKE_SHARED
)
$(
SHAREFLAGS
)
-o
climxm.
$(
SHARED_EXT
)
\
$(
MAKE_SHARED
)
$(
SHAREFLAGS
)
-o
climxm.
$(
SHARED_EXT
)
\
xlibsupport.o xtsupport.o xmsupport.o
\
xlibsupport.o xtsupport.o xmsupport.o
$(
THREADLIB
)
\
$(
IMPORTS
)
$(
TKLIB
)
$(
XTLIB
)
$(
XLIB
)
$(
MOTIFXTRAS
)
)
$(
IMPORTS
)
$(
TKLIB
)
$(
XTLIB
)
$(
XLIB
)
$(
MOTIFXTRAS
)
)
# climxm.sl: xlibsupport.o xtsupport.o xmsupport.o $(IMPORTS)
# climxm.sl: xlibsupport.o xtsupport.o xmsupport.o $(IMPORTS)
...
...
This diff is collapsed.
Click to expand it.
Makefile.linux
+
2
−
1
View file @
756abfad
# $Id: Makefile.linux,v 1.
3
200
2
/07/0
9
2
0:57:14
layer Exp $
# $Id: Makefile.linux,v 1.
4
200
3
/07/0
3
2
1:04:26
layer Exp $
include
Makefile.defs
include
Makefile.defs
...
@@ -9,6 +9,7 @@ XINCLUDES=-I/usr/X11R6/include
...
@@ -9,6 +9,7 @@ XINCLUDES=-I/usr/X11R6/include
TKLIB
=
-lXm
-lXpm
-lXext
-lXp
TKLIB
=
-lXm
-lXpm
-lXext
-lXp
XTLIB
=
-lXt
XTLIB
=
-lXt
XLIB
=
-lX11
XLIB
=
-lX11
THREADLIB
=
-lpthread
SET_LIBRARY_PATH
=
LD_RUN_PATH
=
/usr/X11R6/lib:/lib:/usr/lib
;
export
LD_RUN_PATH
SET_LIBRARY_PATH
=
LD_RUN_PATH
=
/usr/X11R6/lib:/lib:/usr/lib
;
export
LD_RUN_PATH
...
...
This diff is collapsed.
Click to expand it.
Makefile.wnn
+
14
−
2
View file @
756abfad
# $
Header: /repo/cvs.copy/clim2/
Makefile.wnn,v 1.
8
200
2
/07/0
9
2
0:57:14
layer Exp $
# $
Id:
Makefile.wnn,v 1.
9
200
3
/07/0
3
2
1:04:26
layer Exp $
#
#
# Makefile.wnn for CLIM 2.0
# Makefile.wnn for CLIM 2.0
#
#
...
@@ -79,6 +79,18 @@ ifeq ($(REDHAT),6)
...
@@ -79,6 +79,18 @@ ifeq ($(REDHAT),6)
REDHATLIBS
=
-lcrypt
REDHATLIBS
=
-lcrypt
endif
endif
ifeq
($(REDHAT),7)
REDHATLIBS
=
-lcrypt
endif
ifeq
($(REDHAT),8)
REDHATLIBS
=
-lcrypt
endif
ifeq
($(REDHAT),9)
REDHATLIBS
=
-lcrypt
endif
ifeq
($(OS_NAME),linux)
ifeq
($(OS_NAME),linux)
ifeq
($(MACHINE),ppc)
ifeq
($(MACHINE),ppc)
REDHATLIBS
=
-lcrypt
REDHATLIBS
=
-lcrypt
...
@@ -91,4 +103,4 @@ endif
...
@@ -91,4 +103,4 @@ endif
wnn.$(SHARED_EXT)
:
$(WNN_OBJS)
wnn.$(SHARED_EXT)
:
$(WNN_OBJS)
$(
MAKE_SHARED
)
$(
SHAREFLAGS
)
-o
wnn.
$(
SHARED_EXT
)
$(
WNN_OBJS
)
\
$(
MAKE_SHARED
)
$(
SHAREFLAGS
)
-o
wnn.
$(
SHARED_EXT
)
$(
WNN_OBJS
)
\
$(
REDHATLIBS
)
$(
REDHATLIBS
)
$(
THREADLIB
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment