View | Details | Raw Unified | Return to bug 18033 | Differences between
and this patch

Collapse All | Expand All

(-)programs/code_crusader/Make.header (-28 / +8 lines)
Lines 73-83 Link Here
73
#####
73
#####
74
74
75
.PHONY : default
75
.PHONY : default
76
default: libs jcc ctags
76
default: libs jcc
77
77
78
.PHONY : Makefiles
78
.PHONY : Makefiles
79
Makefiles:
79
Makefiles:
80
	@cd ctags; ./configure > /dev/null
81
80
82
#
81
#
83
# required libraries
82
# required libraries
Lines 98-130 Link Here
98
	@cd ${JTOOLBARLIBDIR}; ${MAKE} TOUCHSTRING=${TOUCHSTRING} touch
97
	@cd ${JTOOLBARLIBDIR}; ${MAKE} TOUCHSTRING=${TOUCHSTRING} touch
99
98
100
#
99
#
101
# ctags
102
#
103
104
.PHONY : ctags
105
ctags:
106
	@cd ctags; ${MAKE}; strip ctags
107
108
#
109
# install binaries
100
# install binaries
110
#
101
#
111
102
112
.PHONY : jxinstall
103
.PHONY : jxinstall
113
jxinstall: jcc ctags
104
jxinstall: jcc
114
	@strip jcc
105
	@strip jcc
115
  ifneq (${J_WANT_INSTALL},0)
106
  ifneq (${J_WANT_INSTALL},0)
116
	@mv jcc ctags/ctags ${JX_INSTALL_ROOT}/
107
	@mv jcc ${JX_INSTALL_ROOT}/
117
   ifeq (${shell whoami},root)
118
	@cp ctags/ctags.1 /usr/man/man1/
119
   endif
120
  endif
108
  endif
121
109
122
.PHONY : jxuninstall
110
.PHONY : jxuninstall
123
jxuninstall:
111
jxuninstall:
124
	@${RM} ${JX_INSTALL_ROOT}/jcc ${JX_INSTALL_ROOT}/ctags
112
	@${RM} ${JX_INSTALL_ROOT}/jcc
125
  ifeq (${shell whoami},root)
126
	@${RM} /usr/man/man1/ctags.1
127
  endif
128
113
129
#
114
#
130
# remove binaries
115
# remove binaries
Lines 132-138 Link Here
132
117
133
.PHONY : tidy
118
.PHONY : tidy
134
tidy::
119
tidy::
135
	@cd ctags; ${MAKE} clean > /dev/null
136
120
137
# makemake's clean invokes tidy, which does everything necessary
121
# makemake's clean invokes tidy, which does everything necessary
138
122
Lines 145-158 Link Here
145
129
146
.PHONY : source
130
.PHONY : source
147
source:
131
source:
148
	@-cd ctags; ${MAKE} clean > /dev/null
149
	@cd ${J_DISTR_TAR_DIR}; \
132
	@cd ${J_DISTR_TAR_DIR}; \
150
     tar -czf ${SRC_TAR_FILE} ${filter-out %.o %~ %ctags, \
133
     tar -czf ${SRC_TAR_FILE} ${filter-out %.o %~, \
151
                                ${shell cd ${J_DISTR_TAR_DIR}; echo \
134
                                ${shell cd ${J_DISTR_TAR_DIR}; echo \
152
              ${addprefix ${SRC_FILE_DIR}/, \
135
              ${addprefix ${SRC_FILE_DIR}/, \
153
                README.* LICENSE FAQ Make.* *.fd \
136
                README.* LICENSE FAQ Make.* *.fd \
154
                ${EXTRA_FILES} macros/* desktop/* \
137
                ${EXTRA_FILES} macros/* desktop/* \
155
                code/* rpm/* ctags/* } }}
138
                code/* rpm/* } }}
156
139
157
#
140
#
158
# binary distributions
141
# binary distributions
Lines 179-196 Link Here
179
# distr_sub (JCC_DISTR_TAR_FILE, MKMK_TARGET)
162
# distr_sub (JCC_DISTR_TAR_FILE, MKMK_TARGET)
180
163
181
.PHONY : distr_sub
164
.PHONY : distr_sub
182
distr_sub: ctags
165
distr_sub:
183
	@strip jcc
166
	@strip jcc
184
	@${RM} -r ${JCC}
167
	@${RM} -r ${JCC}
185
	@mkdir ${JCC} ${JCC}/ctags
168
	@mkdir ${JCC}
186
	@ln -s ../README.binary     ${JCC}/README
169
	@ln -s ../README.binary     ${JCC}/README
187
	@ln -s ../jcc               ${JCC}/jcc
170
	@ln -s ../jcc               ${JCC}/jcc
188
	@ln -s ../macros            ${JCC}/macros
171
	@ln -s ../macros            ${JCC}/macros
189
	@ln -s ../desktop           ${JCC}/desktop
172
	@ln -s ../desktop           ${JCC}/desktop
190
	@ln -s ../../ctags/ctags    ${JCC}/ctags/ctags
191
	@cp LICENSE FAQ ${EXTRA_FILES} ${JCC}/
173
	@cp LICENSE FAQ ${EXTRA_FILES} ${JCC}/
192
	@cp ctags/COPYING ctags/FAQ ctags/NEWS ctags/QUOTES ctags/README \
193
        ctags/ctags.1 ${JCC}/ctags/
194
	@cd ${MKMKDIR}; \
174
	@cd ${MKMKDIR}; \
195
     ${MAKE} JCC_TAR_DIR=${JCC_TAR_DIR}/${JCC} ${MKMK_TARGET}
175
     ${MAKE} JCC_TAR_DIR=${JCC_TAR_DIR}/${JCC} ${MKMK_TARGET}
196
	@tar -chf ${JCC_DISTR_TAR_FILE} ${JCC}/*
176
	@tar -chf ${JCC_DISTR_TAR_FILE} ${JCC}/*

Return to bug 18033