janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

$(TOPDIR), make: Minor fixes

Browse source
This commit is contained in:
Jan Lindemann 2002-07-03 20:33:20 +00:00 • committed by Jan Lindemann
commit 024bd57875
6 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1.0.0-0-dev 1.0.0-2-dev

13
make/defs-orig.mk
View file

@ -17,9 +17,9 @@ ifndef PROJECT
lock sigsync shmem \ lock sigsync shmem \
usrv uclnt statecheck msgfmt \ usrv uclnt statecheck msgfmt \
YMisc YError \ YMisc YError \
YThread YMutex YEvent YCbContr \ YThread YMutex YEvent YCbContr contr/Y2WayMap \
YTimeB YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \ YTimeB YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \
lib include lib include bin
endif endif
LIBNAME := $(PROJECT) LIBNAME := $(PROJECT)
@ -134,15 +134,16 @@ MEMBERS = $(LIB_A)($(OBJ))
#YAMD = yamd- #YAMD = yamd-
#EFENCE = -lefence #EFENCE = -lefence
#CFLAGS += -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production #CFLAGS += -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production
CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH) CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH)
CFLAGS += $(INCLUDE) $(PROJECT_CFLAGS) $(CFLAGS_DEBUG) $(LOCAL_CFLAGS) $(YLIB_CFLAGS) CPPFLAGS_DEBUG = $(CFLAGS_DEBUG)
CPPFLAGS += $(INCLUDE) $(PROJECT_CPPFLAGS) $(CPPFLAGS_DEBUG) $(LOCAL_CPPFLAGS) $(YLIB_CPPFLAGS) CFLAGS += $(INCLUDE) $(PROJECT_CFLAGS) $(LOCAL_CFLAGS) $(YLIB_CFLAGS)
CPPFLAGS += $(INCLUDE) $(PROJECT_CPPFLAGS) $(LOCAL_CPPFLAGS) $(YLIB_CPPFLAGS)
LDFFTW = -lrfftw -lfftw -lm LDFFTW = -lrfftw -lfftw -lm
#LDAUDIO = -laudiofile #LDAUDIO = -laudiofile
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
CFLAGS += $(CFLAGS_DEBUG) CFLAGS += $(CFLAGS_DEBUG)
CPPFLAGS += $(CFLAGS_DEBUG) CPPFLAGS += $(CPPFLAGS_DEBUG)
endif endif
LIBDIR = $(TOPDIR)/lib LIBDIR = $(TOPDIR)/lib

2
make/dirs.mk
View file

@ -16,7 +16,7 @@ subdirs:
$(make_subdirs) $(make_subdirs)
clean distclean: clean distclean:
rm -rf $(TEXTCLEAN) $(CLEAN) rm -rf $(TEXTCLEAN) $(CLEAN) dist *.done *~ .*.swp *.tmp core *.rep
$(make_subdirs_target) $(make_subdirs_target)
.DEFAULT: .DEFAULT:

11
make/mkspec.sh
View file

@ -111,11 +111,12 @@ echo "%install"
#echo 'pwd' #echo 'pwd'
echo "export ENV_PREFIX=\$RPM_BUILD_ROOT" echo "export ENV_PREFIX=\$RPM_BUILD_ROOT"
echo "export INSTALL_LOG=$INSTALL_LOG" echo "export INSTALL_LOG=$INSTALL_LOG"
echo "rm -rf `dirname $INSTALL_LOG`"
echo "mkdir -p `dirname $INSTALL_LOG`" echo "mkdir -p `dirname $INSTALL_LOG`"
echo "> $INSTALL_LOG" echo "> $INSTALL_LOG"
echo "make install" echo "make install"
echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -ve 'include\|devel\|make\|lib.*\.a$' > $INSTALL_LOG.$NAME" echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -ve 'include\|devel\|make\|lib.*\.a$\|lib.*\.so$' > $INSTALL_LOG-run"
echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -e 'include\|devel\|make\|lib.*\.a$' > $INSTALL_LOG.$NAME-devel" echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -e 'include\|devel\|make\|lib.*\.a$\|lib.*\.so$' > $INSTALL_LOG-devel"
#echo "install -m 755 $TOPDIR/lib/*.so \$RPM_BUILD_ROOT/opt/ytools/lib" #echo "install -m 755 $TOPDIR/lib/*.so \$RPM_BUILD_ROOT/opt/ytools/lib"
#echo "install -m 644 $TOPDIR/doc/ytools/dist/* \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools" #echo "install -m 644 $TOPDIR/doc/ytools/dist/* \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools"
#echo "install -m 644 $TOPDIR/COPYING \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools" #echo "install -m 644 $TOPDIR/COPYING \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools"
@ -124,9 +125,9 @@ echo ""
#echo "%post /sbin/ldconfig" #echo "%post /sbin/ldconfig"
echo "" echo ""
echo "%clean" echo "%clean"
echo 'rm -rf $RPM_BUILD_ROOT' #echo 'rm -rf $RPM_BUILD_ROOT'
echo "%files -n $NAME-run -f $INSTALL_LOG.$NAME" echo "%files -n $NAME-run -f $INSTALL_LOG-run"
echo "%files -n $NAME-devel -f $INSTALL_LOG.$NAME-devel" echo "%files -n $NAME-devel -f $INSTALL_LOG-devel"
echo '%defattr (-, root, root)' echo '%defattr (-, root, root)'
#echo "%dir /opt/ytools/lib" #echo "%dir /opt/ytools/lib"
#echo "/opt/ytools/lib" #echo "/opt/ytools/lib"

4
make/rpmdist.mk
View file

@ -73,10 +73,10 @@ cpfiles.dist:
cp $(SRPMS_DIR)/$(notdir $@) $@ cp $(SRPMS_DIR)/$(notdir $@) $@
$(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386): $(DIST_PCKG_DIR)/$(PCKG_TAR) $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386): $(DIST_PCKG_DIR)/$(PCKG_TAR)
if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then rpm -tb --clean $<; fi if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then rpm -tb $<; fi
cp $(RPMS_DIR)/$(notdir $@) $@ cp $(RPMS_DIR)/$(notdir $@) $@
$(DIST_PCKG_DIR)/CURRENT_%: $(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION
echo $(CURRENT_$*) > $@ echo $(CURRENT_$*) > $@

15
make/rules.mk
View file

@ -27,14 +27,11 @@ $(LIBDIR):
moc_%.cpp: %.h moc_%.cpp: %.h
$(MOC) -o $@ $< $(MOC) -o $@ $<
#ifeq ($(LIBTYPE),shared) ifeq ($(LIBTYPE),shared)
#lib%.so: %.o $(LIB_SO) lib%.so: %.o $(LIB_SO)
#else else
#lib%.so: %.o
#endif
# $(CC) $< $(LDFLAGS) -o $@
lib%.so: %.o lib%.so: %.o
endif
$(CC) $< $(LDFLAGS) -o $@ $(CC) $< $(LDFLAGS) -o $@
$(LIB_SO): $(LIB_A) $(LIB_SO): $(LIB_A)
@ -47,7 +44,7 @@ $(TOPDIR)/include/%.h: %.h
mkdir -p $(dir $@); cp $(@F) $@ mkdir -p $(dir $@); cp $(@F) $@
$(TOPDIR)/bin/%.sh: %.sh $(TOPDIR)/bin/%.sh: %.sh
mkdir -p $(dir $@); cp $(@F) $@ mkdir -p $(dir $@); install -m 755 $(@F) $@
%.o: %.cpp %.o: %.cpp
$(CPP) $(CPPFLAGS) -c $< $(CPP) $(CPPFLAGS) -c $<
@ -73,7 +70,7 @@ $(LIBS):
make -C $(LIBDIR) all make -C $(LIBDIR) all
$(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) $(INSTALL_MKDIR): $(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) $(INSTALL_MKDIR):
mkdir -p $@ $(INSTALL) -d -g $(EXEGROUP) -o $(EXEOWNER) -m $(EXEMODE) $@
$(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): libdir.done $(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): libdir.done